Stefan Dösinger : wined3d: Make WINED3DRS_DEBUGMONITORTOKEN a nogl state.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Sun Dec 10 23:21:17 2006 +0100

wined3d: Make WINED3DRS_DEBUGMONITORTOKEN a nogl state.

---

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

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index ed9978d..2c640d9 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3427,6 +3427,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     case WINED3DRS_MULTISAMPLEMASK :
     case WINED3DRS_PATCHEDGESTYLE :
     case WINED3DRS_PATCHSEGMENTS :
+    case WINED3DRS_DEBUGMONITORTOKEN :
         StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
         break;

@@ -3437,20 +3438,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         return WINED3DERR_INVALIDCALL;
       }

-    case WINED3DRS_DEBUGMONITORTOKEN :
-    {
-        /* Only useful for "debug builds". */
-        if(0xbaadcafe != Value) {
-            /* MSDN says the default is D3DDMT_ENABLE but our tests confirm 0xbaadcafe is the default. */
-            /* MSDN says anything other than D3DDMT_ENABLE or DISABLE does not change the state,
-             * but our tests disagree.
-             * We do not claim to implement a debugging lib, so do not write an ERR
-             */
-            WARN("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value);
-        }
-        break;
-    }
-
     case WINED3DRS_POSITIONDEGREE :
     {
         if(WINED3DDEGREE_CUBIC != Value)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 71ab64f..23f5f84 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1360,7 +1360,7 @@ const struct StateEntry StateTable[] =
     { /*162, WINED3DRS_MULTISAMPLEMASK              */      STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            state_multisampmask },
     { /*163, WINED3DRS_PATCHEDGESTYLE               */      STATE_RENDER(WINED3DRS_PATCHEDGESTYLE),             state_patchededge   },
     { /*164, WINED3DRS_PATCHSEGMENTS                */      STATE_RENDER(WINED3DRS_PATCHSEGMENTS),              state_patchsegments },
-    { /*165, WINED3DRS_DEBUGMONITORTOKEN            */      STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN),          state_unknown       },
+    { /*165, WINED3DRS_DEBUGMONITORTOKEN            */      STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN),          state_nogl          },
     { /*166, WINED3DRS_POINTSIZE_MAX                */      STATE_RENDER(WINED3DRS_POINTSIZE_MAX),              state_psizemax      },
     { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE     */      0,                                                  state_nogl          },
     { /*168, WINED3DRS_COLORWRITEENABLE             */      STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    },