[WINED3D 5/8] Add D3DFILLMODE to the WINED3D namespace

[Ivan Gyurdiev]

-------------- next part --------------
---
 dlls/wined3d/device.c        |    8 ++++----
 dlls/wined3d/stateblock.c    |    2 +-
 include/wine/wined3d_types.h |    8 ++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 8c5a780..4863c55 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3431,10 +3431,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl
 
     switch (State) {
     case WINED3DRS_FILLMODE                  :
-        switch ((D3DFILLMODE) Value) {
-        case D3DFILL_POINT               : glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break;
-        case D3DFILL_WIREFRAME           : glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break;
-        case D3DFILL_SOLID               : glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break;
+        switch ((WINED3DFILLMODE) Value) {
+        case WINED3DFILL_POINT               : glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); break;
+        case WINED3DFILL_WIREFRAME           : glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); break;
+        case WINED3DFILL_SOLID               : glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); break;
         default:
             FIXME("Unrecognized WINED3DRS_FILLMODE value %d\n", Value);
         }
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 012e9c0..37c12c8 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -843,7 +843,7 @@ static HRESULT  WINAPI IWineD3DStateBloc
     } else {
        IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE,       WINED3DZB_FALSE);
     }
-    IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE,         D3DFILL_SOLID);
+    IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE,         WINED3DFILL_SOLID);
     IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE,        WINED3DSHADE_GOURAUD);
     lp.lp.wRepeatFactor = 0;
     lp.lp.wLinePattern  = 0;
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index c703c8b..529b65a 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -505,6 +505,14 @@ typedef enum _WINED3DSHADEMODE {
     WINED3DSHADE_FORCE_DWORD        = 0x7fffffff
 } WINED3DSHADEMODE;
 
+typedef enum _WINED3DFILLMODE {
+    WINED3DFILL_POINT               = 1,
+    WINED3DFILL_WIREFRAME           = 2,
+    WINED3DFILL_SOLID               = 3,
+
+    WINED3DFILL_FORCE_DWORD         = 0x7fffffff
+} WINED3DFILLMODE;
+
 typedef enum _WINED3DCULL {
     WINED3DCULL_NONE                = 1,
     WINED3DCULL_CW                  = 2,
-- 
1.4.2.4