commit 18c9e5d5d0835d2bd5434e10e96c6b9a5a6f05e9
author Felix Nawothnig <flexo@holycrap.org> Thu Mar 29 18:45:04 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Fri Mar 30 11:25:23 2007 +0200
tree 64a3260c61ee0cce4e919286ea657bb17cbba1b4
parent 6760ccac1c0bad7fb6a5b7b8c6f6786e2b2be881

wined3d: Use GL_TEXTURE_2D for dummy textures.

dlls/wined3d/state.c

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0548198..07af88d 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1549,8 +1549,6 @@
  */
 static void activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock) {
     if(stateblock->textures[stage]) {
-        glDisable(GL_TEXTURE_1D);
-        checkGLcall("glDisable(GL_TEXTURE_1D)");
         switch(stateblock->textureDimensions[stage]) {
             case GL_TEXTURE_2D:
                 glDisable(GL_TEXTURE_3D);
@@ -1590,8 +1588,6 @@
             glDisable(GL_TEXTURE_CUBE_MAP_ARB);
             checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)");
         }
-        glEnable(GL_TEXTURE_1D);
-        checkGLcall("glEnable(GL_TEXTURE_1D)");
         /* Binding textures is done by samplers. A dummy texture will be bound */
     }
 }
@@ -1639,8 +1635,6 @@
         TRACE("Stage disabled\n");
         if (mapped_stage != -1) {
             /* Disable everything here */
-            glDisable(GL_TEXTURE_1D);
-            checkGLcall("glDisable(GL_TEXTURE_1D)");
             glDisable(GL_TEXTURE_2D);
             checkGLcall("glDisable(GL_TEXTURE_2D)");
             glDisable(GL_TEXTURE_3D);
@@ -2079,8 +2073,8 @@
                 activate_dimensions(sampler, stateblock);
             }
         } /* Otherwise tex_colorop disables the stage */
-        glBindTexture(GL_TEXTURE_1D, stateblock->wineD3DDevice->dummyTextureName[sampler]);
-        checkGLcall("glBindTexture(GL_TEXTURE_1D, stateblock->wineD3DDevice->dummyTextureName[sampler])");
+        glBindTexture(GL_TEXTURE_2D, stateblock->wineD3DDevice->dummyTextureName[sampler]);
+        checkGLcall("glBindTexture(GL_TEXTURE_2D, stateblock->wineD3DDevice->dummyTextureName[sampler])");
     }
 }