ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Explicitly pass blit_priv and gl_info to gen_yuv_shader().

This commit is contained in:
Henri Verbeet 2010-12-09 23:41:16 +01:00 committed by Alexandre Julliard
parent 6d8a19def4
commit fa75517155
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/arb_program_shader.c
View File

@ -6872,13 +6872,12 @@ static void upload_palette(IWineD3DSurfaceImpl *surface)
} }
/* Context activation is done by the caller. */ /* 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; GLenum shader;
struct wined3d_shader_buffer buffer; struct wined3d_shader_buffer buffer;
char luminance_component; char luminance_component;
struct arbfp_blit_priv *priv = device->blit_priv;
GLint pos; GLint pos;
/* Shader header */ /* Shader header */
@ -7083,7 +7082,7 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, IWineD3DSurfaceImpl *surfac
return E_NOTIMPL; 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(); ENTER_GL();
glEnable(GL_FRAGMENT_PROGRAM_ARB); glEnable(GL_FRAGMENT_PROGRAM_ARB);