Stefan Dösinger : wined3d: Move WINED3DRS_DITHERENABLE to the state table.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bb622e81bd8de7bc73a807693a05b74d604bbe42
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bb622e81bd8de7bc73a807693a...

Author: Stefan Dösinger 
Date:   Fri Dec  8 01:42:43 2006 +0100

wined3d: Move WINED3DRS_DITHERENABLE to the state table.

---

dlls/wined3d/device.c |   12 +-----------
 dlls/wined3d/state.c  |   12 +++++++++++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 8a073be..91acffd 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3441,18 +3441,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     case WINED3DRS_ZENABLE                   :
     case WINED3DRS_CULLMODE                  :
     case WINED3DRS_SHADEMODE                 :
-        StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
-        break;
-
-
     case WINED3DRS_DITHERENABLE              :
-        if (Value) {
-            glEnable(GL_DITHER);
-            checkGLcall("glEnable GL_DITHER");
-        } else {
-            glDisable(GL_DITHER);
-            checkGLcall("glDisable GL_DITHER");
-        }
+        StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
         break;

case WINED3DRS_ZWRITEENABLE              :
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 5f6397f..0d104e0 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -172,6 +172,16 @@ static void state_shademode(DWORD state,
     }
 }

+static void state_ditherenable(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+    if (stateblock->renderState[WINED3DRS_DITHERENABLE]) {
+        glEnable(GL_DITHER);
+        checkGLcall("glEnable GL_DITHER");
+    } else {
+        glDisable(GL_DITHER);
+        checkGLcall("glDisable GL_DITHER");
+    }
+}
+
 const struct StateEntry StateTable[] =
 {
       /* State name                                         representative,                                     apply function */
@@ -201,7 +211,7 @@ const struct StateEntry StateTable[] =
     { /* 23, WINED3DRS_ZFUNC                        */      STATE_RENDER(WINED3DRS_ZFUNC),                      state_unknown       },
     { /* 24, WINED3DRS_ALPHAREF                     */      STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            state_unknown       },
     { /* 25, WINED3DRS_ALPHAFUNC                    */      STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            state_unknown       },
-    { /* 26, WINED3DRS_DITHERENABLE                 */      STATE_RENDER(WINED3DRS_DITHERENABLE),               state_unknown       },
+    { /* 26, WINED3DRS_DITHERENABLE                 */      STATE_RENDER(WINED3DRS_DITHERENABLE),               state_ditherenable  },
     { /* 27, WINED3DRS_ALPHABLENDENABLE             */      STATE_RENDER(WINED3DRS_ALPHABLENDENABLE),           state_unknown       },
     { /* 28, WINED3DRS_FOGENABLE                    */      STATE_RENDER(WINED3DRS_FOGENABLE),                  state_unknown       },
     { /* 29, WINED3DRS_SPECULARENABLE               */      STATE_RENDER(WINED3DRS_SPECULARENABLE),             state_unknown       },