Stefan Dösinger : wined3d: Don' t disable ARBfp if the replacement pipeline is used.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9d63585352897f615eb5b1a0be11bbdd8cacd082
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9d63585352897f615eb5b1a0be11bbdd8cacd082

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Sat Jun 27 13:14:28 2009 +0200

wined3d: Don't disable ARBfp if the replacement pipeline is used.

If the replacement pipeline is used, ARBfp is always on. Disabling it
can break shaders or the replacement pipeline, because the shader and
ffp code assumes the extension is on.

---

 dlls/wined3d/arb_program_shader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 5fb0f63..026fac1 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4180,7 +4180,7 @@ static void shader_arb_deselect_depth_blt(IWineD3DDevice *iface) {
         checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");
 
         TRACE("(%p) : Bound fragment program %u and enabled GL_FRAGMENT_PROGRAM_ARB\n", This, priv->current_fprogram_id);
-    } else {
+    } else if(!priv->use_arbfp_fixed_func) {
         glDisable(GL_FRAGMENT_PROGRAM_ARB);
         checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)");
     }