WINED3D: Use GL_LIMITS(samplers) instead of GL_LIMITS(sampler_stages) in IWineD3DSurfaceImpl_UnlockRect

H. Verbeet hverbeet at gmail.com
Sun Jul 30 16:26:37 CDT 2006


GL_LIMITS(samplers) is the amount of samplers the card supports,
GL_LIMITS(sampler_stages) is the amount of sampler stages we have for
use with SetSamplerStage(). In this case we want the amount of
samplers.

Changelog:
  - Use GL_LIMITS(samplers) instead of GL_LIMITS(sampler_stages) in
IWineD3DSurfaceImpl_UnlockRect
-------------- next part --------------
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index de9322b..67cd009 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1130,7 +1130,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp
             }
 
             /* Disable higher textures before calling glDrawPixels */
-            for(tex = 1; tex < GL_LIMITS(sampler_stages); tex++) {
+            for(tex = 1; tex < GL_LIMITS(samplers); tex++) {
                 if (GL_SUPPORT(ARB_MULTITEXTURE)) {
                     GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + tex));
                     checkGLcall("glActiveTextureARB");


More information about the wine-patches mailing list