Restore the texture env mode on SetTexture - Fixes problem in

codesampler demo.

Restore the texture env mode on SetTexture - Fixes problem in
ffd4fd51 · Jason Edmeades · Alexandre Julliard · 4a46348a · ffd4fd51
Commit ffd4fd51 authored Jan 21, 2003 by Jason Edmeades Committed by Alexandre Julliard Jan 21, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

device.c dlls/d3d8/device.c +6 -1

No files found.
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -3511,7 +3511,12 @@ HRESULT  WINAPI  IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa
                        glDisable(GL_TEXTURE_3D);
                        checkGLcall("Disable GL_TEXTURE_3D");
                    }
-		}
+                }
+
+                /* Re-Enable GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT */
+                if (Value != D3DTOP_DISABLE) {
+                    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
+                }

                /* Now set up the operand correctly */
                switch (Value) {