Henri Verbeet : wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader().
Alexandre Julliard
julliard at winehq.org
Fri Dec 10 11:56:58 CST 2010
Module: wine
Branch: master
Commit: fa755171559d32e306aca300bfdc5b1d04b1aeb5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa755171559d32e306aca300bfdc5b1d04b1aeb5
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Dec 9 23:41:16 2010 +0100
wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader().
---
dlls/wined3d/arb_program_shader.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 7dc3c81..397ad87 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -6872,13 +6872,12 @@ static void upload_palette(IWineD3DSurfaceImpl *surface)
}
/* Context activation is done by the caller. */
-static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum complex_fixup yuv_fixup, GLenum textype)
+static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info,
+ enum complex_fixup yuv_fixup, GLenum textype)
{
- const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
GLenum shader;
struct wined3d_shader_buffer buffer;
char luminance_component;
- struct arbfp_blit_priv *priv = device->blit_priv;
GLint pos;
/* Shader header */
@@ -7083,7 +7082,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
return E_NOTIMPL;
}
- if (!shader) shader = gen_yuv_shader(device, fixup, textype);
+ if (!shader) shader = gen_yuv_shader(priv, gl_info, fixup, textype);
ENTER_GL();
glEnable(GL_FRAGMENT_PROGRAM_ARB);
More information about the wine-cvs
mailing list