Henri Verbeet : wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw .

Alexandre Julliard julliard at winehq.org
Fri Apr 2 10:17:10 CDT 2010


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Apr  1 21:28:54 2010 +0200

wined3d: Move handling of the unimplemented WINED3DRS_STIPPLEPATTERN states to ddraw.

---

 dlls/ddraw/device.c      |   19 ++++++++++++++++---
 dlls/wined3d/utils.c     |   32 --------------------------------
 include/wine/wined3d.idl |   32 --------------------------------
 3 files changed, 16 insertions(+), 67 deletions(-)

diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
index a231a50..f70fdba 100644
--- a/dlls/ddraw/device.c
+++ b/dlls/ddraw/device.c
@@ -2447,7 +2447,14 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface,
             break;
 
         default:
-            /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
+            if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00
+                    && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)
+            {
+                FIXME("Unhandled stipple pattern render state (%#x).\n",
+                        RenderStateType);
+                hr = E_NOTIMPL;
+                break;
+            }
             hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice,
                                                RenderStateType,
                                                Value);
@@ -2736,8 +2743,14 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface,
             break;
 
         default:
-
-            /* FIXME: Unhandled: D3DRENDERSTATE_STIPPLEPATTERN00 - 31 */
+            if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00
+                    && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31)
+            {
+                FIXME("Unhandled stipple pattern render state (%#x).\n",
+                        RenderStateType);
+                hr = E_NOTIMPL;
+                break;
+            }
 
             hr = IWineD3DDevice_SetRenderState(This->wineD3DDevice,
                                                RenderStateType,
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 363bf4b..9a37a35 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1548,38 +1548,6 @@ const char* debug_d3drenderstate(DWORD state) {
     D3DSTATE_TO_STR(WINED3DRS_STENCILMASK               );
     D3DSTATE_TO_STR(WINED3DRS_STENCILWRITEMASK          );
     D3DSTATE_TO_STR(WINED3DRS_TEXTUREFACTOR             );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN00          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN01          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN02          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN03          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN04          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN05          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN06          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN07          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN08          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN09          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN10          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN11          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN12          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN13          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN14          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN15          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN16          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN17          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN18          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN19          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN20          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN21          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN22          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN23          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN24          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN25          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN26          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN27          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN28          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN29          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN30          );
-    D3DSTATE_TO_STR(WINED3DRS_STIPPLEPATTERN31          );
     D3DSTATE_TO_STR(WINED3DRS_WRAP0                     );
     D3DSTATE_TO_STR(WINED3DRS_WRAP1                     );
     D3DSTATE_TO_STR(WINED3DRS_WRAP2                     );
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index ede80ad..d8eee95 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -330,38 +330,6 @@ typedef enum _WINED3DRENDERSTATETYPE
     WINED3DRS_STENCILMASK                   = 58,
     WINED3DRS_STENCILWRITEMASK              = 59,
     WINED3DRS_TEXTUREFACTOR                 = 60,
-    WINED3DRS_STIPPLEPATTERN00              = 64,
-    WINED3DRS_STIPPLEPATTERN01              = 65,
-    WINED3DRS_STIPPLEPATTERN02              = 66,
-    WINED3DRS_STIPPLEPATTERN03              = 67,
-    WINED3DRS_STIPPLEPATTERN04              = 68,
-    WINED3DRS_STIPPLEPATTERN05              = 69,
-    WINED3DRS_STIPPLEPATTERN06              = 70,
-    WINED3DRS_STIPPLEPATTERN07              = 71,
-    WINED3DRS_STIPPLEPATTERN08              = 72,
-    WINED3DRS_STIPPLEPATTERN09              = 73,
-    WINED3DRS_STIPPLEPATTERN10              = 74,
-    WINED3DRS_STIPPLEPATTERN11              = 75,
-    WINED3DRS_STIPPLEPATTERN12              = 76,
-    WINED3DRS_STIPPLEPATTERN13              = 77,
-    WINED3DRS_STIPPLEPATTERN14              = 78,
-    WINED3DRS_STIPPLEPATTERN15              = 79,
-    WINED3DRS_STIPPLEPATTERN16              = 80,
-    WINED3DRS_STIPPLEPATTERN17              = 81,
-    WINED3DRS_STIPPLEPATTERN18              = 82,
-    WINED3DRS_STIPPLEPATTERN19              = 83,
-    WINED3DRS_STIPPLEPATTERN20              = 84,
-    WINED3DRS_STIPPLEPATTERN21              = 85,
-    WINED3DRS_STIPPLEPATTERN22              = 86,
-    WINED3DRS_STIPPLEPATTERN23              = 87,
-    WINED3DRS_STIPPLEPATTERN24              = 88,
-    WINED3DRS_STIPPLEPATTERN25              = 89,
-    WINED3DRS_STIPPLEPATTERN26              = 90,
-    WINED3DRS_STIPPLEPATTERN27              = 91,
-    WINED3DRS_STIPPLEPATTERN28              = 92,
-    WINED3DRS_STIPPLEPATTERN29              = 93,
-    WINED3DRS_STIPPLEPATTERN30              = 94,
-    WINED3DRS_STIPPLEPATTERN31              = 95,
     WINED3DRS_WRAP0                         = 128,
     WINED3DRS_WRAP1                         = 129,
     WINED3DRS_WRAP2                         = 130,




More information about the wine-cvs mailing list