[37/47] WineD3D: Move WINED3DRS_MULTISAMPLEMASK to the state table

[Stefan Dösinger]

-------------- next part --------------
From 62359a0de12d39c41c08b35a4328c11141e982e1 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 10 Dec 2006 19:37:57 +0100
Subject: [PATCH] WineD3D: Move WINED3DRS_MULTISAMPLEMASK to the state table

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

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 88c4639..2fb1221 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3430,6 +3430,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     case WINED3DRS_TEXTUREPERSPECTIVE    :
     case WINED3DRS_STIPPLEDALPHA    :
     case WINED3DRS_ANTIALIAS :
+    case WINED3DRS_MULTISAMPLEMASK :
         StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
         break;
 
@@ -3440,13 +3441,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         return WINED3DERR_INVALIDCALL;
       }
 
-    case WINED3DRS_MULTISAMPLEMASK :
-    {
-        if(0xFFFFFFFF != Value)
-            ERR("(%p)->(%s,%d) not yet implemented\n", This, debug_d3drenderstate(State), Value);
-        break;
-    }
-
     case WINED3DRS_PATCHEDGESTYLE :
     {
         if(WINED3DPATCHEDGE_DISCRETE != Value)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index c61ffd4..5214195 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1166,6 +1166,12 @@ static void state_antialias(DWORD state,
         ERR(" Antialias not supported yet.\n");
 }
 
+static void state_multisampmask(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+    TRACE("Stub\n");
+    if (stateblock->renderState[WINED3DRS_MULTISAMPLEMASK] != 0xFFFFFFFF)
+        ERR("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]);
+}
+
 const struct StateEntry StateTable[] =
 {
       /* State name                                         representative,                                     apply function */
@@ -1333,7 +1339,7 @@ const struct StateEntry StateTable[] =
     { /*159, WINED3DRS_POINTSCALE_B                 */      STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           state_pscale        },
     { /*160, WINED3DRS_POINTSCALE_C                 */      STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           state_pscale        },
     { /*161, WINED3DRS_MULTISAMPLEANTIALIAS         */      STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS),       state_multisampleaa },
-    { /*162, WINED3DRS_MULTISAMPLEMASK              */      STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            state_unknown       },
+    { /*162, WINED3DRS_MULTISAMPLEMASK              */      STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            state_multisampmask },
     { /*163, WINED3DRS_PATCHEDGESTYLE               */      STATE_RENDER(WINED3DRS_PATCHEDGESTYLE),             state_unknown       },
     { /*164, WINED3DRS_PATCHSEGMENTS                */      STATE_RENDER(WINED3DRS_PATCHSEGMENTS),              state_unknown       },
     { /*165, WINED3DRS_DEBUGMONITORTOKEN            */      STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN),          state_unknown       },
-- 
1.4.2.4