Module: wine Branch: master Commit: 0e2713a1e15ad0814581497879798ee9678593ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2713a1e15ad0814581497879...
Author: Stefan Dösinger stefan@codeweavers.com Date: Thu Aug 21 13:16:07 2008 -0500
wined3d: Remove unneeded code.
The fixed function backend disables the extension. Also messing with the final combiner shouldn't be needed if nvrc is disabled.
---
dlls/wined3d/context.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb3fcc4..66206bd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -740,10 +740,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex /* Disable all textures. The caller can then bind a texture it wants to blit * from */ - if(GL_SUPPORT(NV_REGISTER_COMBINERS)) { - glDisable(GL_REGISTER_COMBINERS_NV); - checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); - } if (GL_SUPPORT(ARB_MULTITEXTURE)) { /* The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed * function texture unit. No need to care for higher samplers @@ -855,11 +851,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable); checkGLcall("glDisable(GL_COLOR_SUM_EXT)"); } - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable); - checkGLcall("glFinalCombinerInputNV"); - }
/* Setup transforms */ glMatrixMode(GL_MODELVIEW);