June 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Only use stretch_rect_fbo() on surfaces that are FBO attachable.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: fb7531599f76f7af7be11798bf12f83f61428d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7531599f76f7af7be11798b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 14:39:20 2009 +0200 wined3d: Only use stretch_rect_fbo() on surfaces that are FBO attachable. --- dlls/wined3d/surface.c | 21 ++++++++++++++++++--- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d65105d..2f5554f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -523,6 +523,17 @@ void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) } } +static inline BOOL surface_can_stretch_rect(IWineD3DSurfaceImpl *src, IWineD3DSurfaceImpl *dst) +{ + return ((src->resource.format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) + || (src->resource.usage & WINED3DUSAGE_RENDERTARGET)) + && ((dst->resource.format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) + || (dst->resource.usage & WINED3DUSAGE_RENDERTARGET)) + && (src->resource.format_desc->format == dst->resource.format_desc->format + || (is_identity_fixup(src->resource.format_desc->color_fixup) + && is_identity_fixup(dst->resource.format_desc->color_fixup))); +} + static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -3408,7 +3419,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT)) { + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) + && surface_can_stretch_rect(Src, This)) + { stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect, (IWineD3DSurface *)This, &rect, Filter, upsideDown); } else if((!stretchx) || rect.x2 - rect.x1 > Src->currentDesc.Width || @@ -3470,8 +3483,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const Src->palette = This->palette; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) && - (Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) == 0) { + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) + && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) + && surface_can_stretch_rect(Src, This)) + { TRACE("Using stretch_rect_fbo\n"); /* The source is always a texture, but never the currently active render target, and the texture * contents are never upside down diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef55419..e95bd4c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -549,6 +549,7 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) { TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); + desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; desc->rtInternal = desc->glInternal; } else diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a610b7a..adf6235 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2749,6 +2749,7 @@ extern WINED3DFORMAT pixelformat_for_depth(DWORD depth); #define WINED3DFMT_FLAG_STENCIL 0x8 #define WINED3DFMT_FLAG_RENDERTARGET 0x10 #define WINED3DFMT_FLAG_FOURCC 0x20 +#define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x40 struct GlPixelFormatDesc {

1 0

Henri Verbeet : wined3d: Add extension detection to the GL format template table.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 0571ebcee3d0fdb524d8609ea0ec4703cdfad71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0571ebcee3d0fdb524d8609ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Add extension detection to the GL format template table. --- dlls/wined3d/utils.c | 244 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 163 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0571ebcee3d0fdb524d86…

1 0

Henri Verbeet : wined3d: Check FBO compatibility on all formats with a GL format.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 786408fb954aa71065a3385b23d3d9ecca885b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786408fb954aa71065a3385b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Check FBO compatibility on all formats with a GL format. Instead of just the ones that have a fallback specified. --- dlls/wined3d/utils.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d4eed06..ef55419 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -501,7 +501,7 @@ static BOOL init_format_base_info(WineD3D_GL_Info *gl_info) #define GLINFO_LOCATION (*gl_info) -static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format) +static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) { GLuint tex, fb; GLenum status; @@ -511,7 +511,7 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form while(glGetError()); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); - glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, format, type, NULL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); @@ -540,21 +540,34 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (!desc->glInternal) continue; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && desc->rtInternal) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* Check if the default internal format is supported as a frame buffer target, otherwise * fall back to the render target internal. * * Try to stick to the standard format if possible, this limits precision differences. */ - if (check_fbo_compat(gl_info, desc->glInternal)) + if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) { TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); desc->rtInternal = desc->glInternal; } else { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", - debug_d3dformat(desc->format)); + if (!desc->rtInternal) + { + if (desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) + { + FIXME("Internal format of %s not supported as FBO target, and no fallback specified.\n", + debug_d3dformat(desc->format)); + desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + desc->rtInternal = desc->glInternal; + } + else + { + TRACE("Internal format of %s not supported as FBO target, using render target internal instead.\n", + debug_d3dformat(desc->format)); + } } } else

1 0

Henri Verbeet : wined3d: Add extension detection for ARB_depth_texture.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: a2440aed7ecce09f634c2ea1b9903180ae5756af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2440aed7ecce09f634c2ea1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Add extension detection for ARB_depth_texture. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5dab206..06d5476 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -63,6 +63,7 @@ static const struct { /* ARB */ {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT, 0 }, + {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE, 0 }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ad243e3..49d29a7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3384,6 +3384,7 @@ typedef enum _GL_SupportedExt { WINED3D_GL_EXT_NONE, /* ARB */ ARB_COLOR_BUFFER_FLOAT, + ARB_DEPTH_TEXTURE, ARB_DRAW_BUFFERS, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER,

1 0

Henri Verbeet : wined3d: Set texture filtering to NEAREST in check_fbo_compat().
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: b93c3b3253f3fcd3b770408c88f9bd57664c3ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b93c3b3253f3fcd3b770408c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:47 2009 +0200 wined3d: Set texture filtering to NEAREST in check_fbo_compat(). --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 167ba71..d4eed06 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -512,6 +512,8 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); GL_EXTCALL(glGenFramebuffersEXT(1, &fb)); GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb));

1 0

Henri Verbeet : wined3d: Check the result from wine_rb_get() before using it in WINE_RB_ENTRY_VALUE.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: cae6a32b0807bebd5a7dc317c4241de3496ad367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae6a32b0807bebd5a7dc317c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:46 2009 +0200 wined3d: Check the result from wine_rb_get() before using it in WINE_RB_ENTRY_VALUE. --- dlls/wined3d/glsl_shader.c | 5 +++-- dlls/wined3d/utils.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89b1e03..bd91bc9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3277,6 +3277,7 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, IWineD3DVertexShader *vshader, IWineD3DPixelShader *pshader, struct vs_compile_args *vs_args, struct ps_compile_args *ps_args) { + struct wine_rb_entry *entry; glsl_program_key_t key; key.vshader = vshader; @@ -3284,8 +3285,8 @@ static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_p key.vs_args = *vs_args; key.ps_args = *ps_args; - return WINE_RB_ENTRY_VALUE(wine_rb_get(&priv->program_lookup, &key), - struct glsl_shader_prog_link, program_lookup_entry); + entry = wine_rb_get(&priv->program_lookup, &key); + return entry ? WINE_RB_ENTRY_VALUE(entry, struct glsl_shader_prog_link, program_lookup_entry) : NULL; } /* GL locking is done by the caller */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e4c09c8..596bccb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2103,7 +2103,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_settings *settings) { - return WINE_RB_ENTRY_VALUE(wine_rb_get(fragment_shaders, settings), struct ffp_frag_desc, entry); + struct wine_rb_entry *entry = wine_rb_get(fragment_shaders, settings); + return entry ? WINE_RB_ENTRY_VALUE(entry, struct ffp_frag_desc, entry) : NULL; } void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc)

1 0

Eric van Beurden : wininet: Rearrange invalid header checks.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 59a217847cb6a173653f7923ba0aa711354b96a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59a217847cb6a173653f7923b… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Jun 4 10:52:59 2009 -0400 wininet: Rearrange invalid header checks. --- dlls/wininet/http.c | 43 +++++++++++++++++++------------------------ 1 files changed, 19 insertions(+), 24 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c6873ae..1bba8d9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4235,33 +4235,28 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) TRACE("got line %s, now interpreting\n", debugstr_a(bufferA)); if (!bufferA[0]) break; - if (!strchr(bufferA, ':')) - { - WARN("invalid header\n"); - continue; - } MultiByteToWideChar( CP_ACP, 0, bufferA, buflen, buffer, MAX_REPLY_LEN ); - while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) - cchMaxRawHeaders *= 2; - temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); - if (temp == NULL) goto lend; - lpszRawHeaders = temp; - memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); - cchRawHeaders += (buflen-1); - memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); - cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; - lpszRawHeaders[cchRawHeaders] = '\0'; - pFieldAndValue = HTTP_InterpretHttpHeader(buffer); - if (!pFieldAndValue) - break; - - HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1], - HTTP_ADDREQ_FLAG_ADD ); - - HTTP_FreeTokens(pFieldAndValue); - } + if (pFieldAndValue) + { + while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) + cchMaxRawHeaders *= 2; + temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + if (temp == NULL) goto lend; + lpszRawHeaders = temp; + memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR)); + cchRawHeaders += (buflen-1); + memcpy(lpszRawHeaders+cchRawHeaders, szCrLf, sizeof(szCrLf)); + cchRawHeaders += sizeof(szCrLf)/sizeof(szCrLf[0])-1; + lpszRawHeaders[cchRawHeaders] = '\0'; + + HTTP_ProcessHeader(lpwhr, pFieldAndValue[0], pFieldAndValue[1], + HTTP_ADDREQ_FLAG_ADD ); + + HTTP_FreeTokens(pFieldAndValue); + } + } else { cbreaks++;

1 0

Francois Gouget : rpcrt4/tests: Make dummy_Release() static.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: 47be6e8379e848e4a16c65f65705b954a060dae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47be6e8379e848e4a16c65f65… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 5 08:15:44 2009 +0200 rpcrt4/tests: Make dummy_Release() static. --- dlls/rpcrt4/tests/cstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index e3edee7..1ce24ce 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -685,7 +685,7 @@ static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) return InterlockedIncrement( &this->ref ); } -ULONG WINAPI dummy_Release(LPUNKNOWN iface) +static ULONG WINAPI dummy_Release(LPUNKNOWN iface) { struct dummy_unknown *this = (struct dummy_unknown *)iface; return InterlockedDecrement( &this->ref );

1 0

Piotr Caban : jscript: Added Date_setTime implementation.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: c0af3a57c2a80394539c3094368ab65ea5cf4653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0af3a57c2a80394539c30943… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 4 22:37:08 2009 +0200 jscript: Added Date_setTime implementation. --- dlls/jscript/date.c | 29 +++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 4 ++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5f8974b..e17ad26 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -310,8 +310,33 @@ static HRESULT Date_getTimezoneOffset(DispatchEx *dispex, LCID lcid, WORD flags, static HRESULT Date_setTime(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + DateInstance *date; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + date = (DateInstance*)dispex; + date->time = time_clip(num_val(&v)); + + if(retv) + num_set_val(retv, date->time); + + return S_OK; } static HRESULT Date_setMiliseconds(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2b6e0b2..1f922b9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -941,6 +941,10 @@ ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); date = new Date(Infinity); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +ok(date.setTime(123) === 123, "date.setTime(123) !== 123"); +ok(date.setTime("123", NaN) === 123, "date.setTime(\"123\") !== 123"); +ok(isNaN(date.setTime(NaN)), "date.setTime(NaN) is not NaN"); + ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI); Math.PI = "test";

1 0

Henri Verbeet : wined3d: Don't use the vertex/pixel shader when we' re not supposed to.
by Alexandre Julliard June 5, 2009

June 5, 2009

Module: wine Branch: master Commit: daeb86d620f48b5eb8a12feb08864c6211be8b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=daeb86d620f48b5eb8a12feb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 5 10:10:46 2009 +0200 wined3d: Don't use the vertex/pixel shader when we're not supposed to. This also avoids removing programs from lists they're not in in delete_glsl_program_entry(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bd91bc9..6c0fd84 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3945,8 +3945,8 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct shader_glsl_priv *priv = This->shader_priv; const WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - IWineD3DPixelShader *pshader = This->stateBlock->pixelShader; - IWineD3DVertexShader *vshader = This->stateBlock->vertexShader; + IWineD3DPixelShader *pshader = use_ps ? This->stateBlock->pixelShader : NULL; + IWineD3DVertexShader *vshader = use_vs ? This->stateBlock->vertexShader : NULL; struct glsl_shader_prog_link *entry = NULL; GLhandleARB programId = 0; GLhandleARB reorder_shader_id = 0;

1 0