wined3d: Avoid hooking non-fog glEnable/glDisable calls.

This prevents fallout from the GL_EXT_fog_coord emulation. glEnable and glDisable calls other than those that change GL_FOG are not hooked. The glEnableWINE and glDisableWINE functions can be used to add other hooks too if ever needed.

wined3d: Avoid hooking non-fog glEnable/glDisable calls.
365e1f3b · Stefan Dösinger · Alexandre Julliard · 1deafcb5 · 365e1f3b · 365e1f3b
Commit 365e1f3b authored Dec 15, 2008 by Stefan Dösinger Committed by Alexandre Julliard Jan 12, 2009
Showing with 12 additions and 7 deletions

context.c dlls/wined3d/context.c +1 -1

directx.c dlls/wined3d/directx.c +3 -0

gl_compat.c dlls/wined3d/gl_compat.c +4 -4

state.c dlls/wined3d/state.c +2 -2

wined3d_gl.h dlls/wined3d/wined3d_gl.h +2 -0

No files found.
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -1142,7 +1142,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex
    glDisable(GL_DEPTH_TEST);
    checkGLcall("glDisable GL_DEPTH_TEST");
    Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ZENABLE), StateTable);
-    glDisable(GL_FOG);
+    glDisableWINE(GL_FOG);
    checkGLcall("glDisable GL_FOG");
    Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_FOGENABLE), StateTable);
    glDisable(GL_BLEND);

--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4215,6 +4215,9 @@ BOOL InitAdapters(void) {
    glFlush = (void*)pwglGetProcAddress("wglFlush");
 #endif

+    glEnableWINE = glEnable;
+    glDisableWINE = glDisable;
+
    /* For now only one default adapter */
    {
        int iPixelFormat;

--- a/dlls/wined3d/gl_compat.c
+++ b/dlls/wined3d/gl_compat.c
@@ -439,14 +439,14 @@ void add_gl_compat_wrappers(WineD3D_GL_Info *gl_info) {
        if(old_fogcoord_glEnable) {
            FIXME("GL_EXT_fogcoord glEnable hook already applied\n");
        } else {
-            old_fogcoord_glEnable = glEnable;
-            glEnable = wine_glEnable;
+            old_fogcoord_glEnable = glEnableWINE;
+            glEnableWINE = wine_glEnable;
        }
        if(old_fogcoord_glDisable) {
            FIXME("GL_EXT_fogcoord glDisable hook already applied\n");
        } else {
-            old_fogcoord_glDisable = glDisable;
-            glDisable = wine_glDisable;
+            old_fogcoord_glDisable = glDisableWINE;
+            glDisableWINE = wine_glDisable;
        }

        if(old_fogcoord_glVertex4f) {

--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -983,7 +983,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D

    if (!stateblock->renderState[WINED3DRS_FOGENABLE]) {
        /* No fog? Disable it, and we're done :-) */
-        glDisable(GL_FOG);
+        glDisableWINE(GL_FOG);
        checkGLcall("glDisable GL_FOG");
        return;
    }
@@ -1112,7 +1112,7 @@ void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D
        }
    }

-    glEnable(GL_FOG);
+    glEnableWINE(GL_FOG);
    checkGLcall("glEnable GL_FOG");
    if(new_source != context->fog_source) {
        context->fog_source = new_source;

--- a/dlls/wined3d/wined3d_gl.h
+++ b/dlls/wined3d/wined3d_gl.h
@@ -866,6 +866,7 @@ void (WINE_GLAPI *glDepthFunc) (GLenum func);
 void (WINE_GLAPI *glDepthMask) (GLboolean flag);
 void (WINE_GLAPI *glDepthRange) (GLclampd nearParam, GLclampd farParam);
 void (WINE_GLAPI *glDisable) (GLenum cap);
+void (WINE_GLAPI *glDisableWINE) (GLenum cap);
 void (WINE_GLAPI *glDisableClientState) (GLenum array);
 void (WINE_GLAPI *glDrawArrays) (GLenum mode, GLint first, GLsizei count);
 void (WINE_GLAPI *glDrawBuffer) (GLenum mode);
@@ -875,6 +876,7 @@ void (WINE_GLAPI *glEdgeFlag) (GLboolean flag);
 void (WINE_GLAPI *glEdgeFlagPointer) (GLsizei stride, const GLvoid* pointer);
 void (WINE_GLAPI *glEdgeFlagv) (const GLboolean* flag);
 void (WINE_GLAPI *glEnable) (GLenum cap);
+void (WINE_GLAPI *glEnableWINE) (GLenum cap);
 void (WINE_GLAPI *glEnableClientState) (GLenum array);
 void (WINE_GLAPI *glEnd) ();
 void (WINE_GLAPI *glEndList) ();