From 271f56c9f142da4cf370e5cbb6d2d0015751495a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Wed, 3 Sep 2008 16:07:37 -0500 Subject: [PATCH] wined3d: Close a pshader on-off switching loophole. --- dlls/wined3d/arb_program_shader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ca65e3e276d..7fa88c0c0ab 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2912,6 +2912,13 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, if(isStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE))) { if(use_pshader) { IWineD3DPixelShader_CompileShader(stateblock->pixelShader); + } else if(device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) { + /* Reload fixed function constants since they collide with the pixel shader constants */ + for(i = 0; i < MAX_TEXTURES; i++) { + set_bumpmat_arbfp(STATE_TEXTURESTAGE(i, WINED3DTSS_BUMPENVMAT00), stateblock, context); + } + state_texfactor_arbfp(STATE_RENDER(WINED3DRS_TEXTUREFACTOR), stateblock, context); + state_arb_specularenable(STATE_RENDER(WINED3DRS_SPECULARENABLE), stateblock, context); } return; }