Ivan Gyurdiev : wined3d: Add D3DSHADEMODE to the WINED3D namespace.

[Alexandre Julliard]

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

Author: Ivan Gyurdiev 
Date:   Sun Oct 29 21:42:47 2006 -0500

wined3d: Add D3DSHADEMODE to the WINED3D namespace.

---

dlls/wined3d/device.c        |   12 ++++++------
 dlls/wined3d/stateblock.c    |    2 +-
 include/wine/wined3d_types.h |    8 ++++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 0dc289f..edd0760 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3511,20 +3511,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         break;

case WINED3DRS_SHADEMODE                 :
-        switch ((D3DSHADEMODE) Value) {
-        case D3DSHADE_FLAT:
+        switch ((WINED3DSHADEMODE) Value) {
+        case WINED3DSHADE_FLAT:
             glShadeModel(GL_FLAT);
             checkGLcall("glShadeModel");
             break;
-        case D3DSHADE_GOURAUD:
+        case WINED3DSHADE_GOURAUD:
             glShadeModel(GL_SMOOTH);
             checkGLcall("glShadeModel");
             break;
-        case D3DSHADE_PHONG:
-            FIXME("D3DSHADE_PHONG isn't supported\n");
+        case WINED3DSHADE_PHONG:
+            FIXME("WINED3DSHADE_PHONG isn't supported\n");
             break;
         default:
-            FIXME("Unrecognized/Unhandled D3DSHADEMODE value %d\n", Value);
+            FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %d\n", Value);
         }
         break;

diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 509ea38..b8ba379 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -844,7 +844,7 @@ static HRESULT  WINAPI IWineD3DStateBloc
        IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE,       WINED3DZB_FALSE);
     }
     IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE,         D3DFILL_SOLID);
-    IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE,        D3DSHADE_GOURAUD);
+    IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE,        WINED3DSHADE_GOURAUD);
     lp.lp.wRepeatFactor = 0;
     lp.lp.wLinePattern  = 0;
     IWineD3DDevice_SetRenderState(device, WINED3DRS_LINEPATTERN,      lp.d);
diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h
index e627e23..a72b24a 100644
--- a/include/wine/wined3d_types.h
+++ b/include/wine/wined3d_types.h
@@ -497,6 +497,14 @@ typedef enum _WINED3DFOGMODE {
     WINED3DFOG_FORCE_DWORD          = 0x7fffffff
 } WINED3DFOGMODE;

+typedef enum _WINED3DSHADEMODE {
+    WINED3DSHADE_FLAT               = 1,
+    WINED3DSHADE_GOURAUD            = 2,
+    WINED3DSHADE_PHONG              = 3,
+
+    WINED3DSHADE_FORCE_DWORD        = 0x7fffffff
+} WINED3DSHADEMODE;
+
 typedef struct _WINED3DDISPLAYMODE {
     UINT            Width;
     UINT            Height;