[PATCH] WineD3D: remove unneeded code=0A=

[Stefan Doesinger]

=0A=
the fixed function backend disables the extension. Also messing=0A=
with the final combiner shouldn't be needed if nvrc is disabled=0A=
---=0A=
 dlls/wined3d/context.c |    9 ---------=0A=
 1 files changed, 0 insertions(+), 9 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c=0A=
index fb3fcc4..66206bd 100644=0A=
--- a/dlls/wined3d/context.c=0A=
+++ b/dlls/wined3d/context.c=0A=
@@ -740,10 +740,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl =
*This, WineD3DContext *contex=0A=
     /* Disable all textures. The caller can then bind a texture it =
wants to blit=0A=
      * from=0A=
      */=0A=
-    if(GL_SUPPORT(NV_REGISTER_COMBINERS)) {=0A=
-        glDisable(GL_REGISTER_COMBINERS_NV);=0A=
-        checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)");=0A=
-    }=0A=
     if (GL_SUPPORT(ARB_MULTITEXTURE)) {=0A=
         /* The blitting code uses (for now) the fixed function =
pipeline, so make sure to reset all fixed=0A=
          * function texture unit. No need to care for higher samplers=0A=
@@ -855,11 +851,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl =
*This, WineD3DContext *contex=0A=
         Context_MarkStateDirty(context, =
STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable);=0A=
         checkGLcall("glDisable(GL_COLOR_SUM_EXT)");=0A=
     }=0A=
-    if (GL_SUPPORT(NV_REGISTER_COMBINERS)) {=0A=
-        GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, =
GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB));=0A=
-        Context_MarkStateDirty(context, =
STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable);=0A=
-        checkGLcall("glFinalCombinerInputNV");=0A=
-    }=0A=
 =0A=
     /* Setup transforms */=0A=
     glMatrixMode(GL_MODELVIEW);=0A=
-- =0A=
1.5.6.4=0A=
=0A=

------=_NextPart_000_01E9_01C90793.BBE58D20--