[PATCH 4/5] wined3d: Get rid of the WINED3DSHADEMODE typedef.
Henri Verbeet
hverbeet at codeweavers.com
Mon Jan 2 14:45:29 CST 2012
---
dlls/wined3d/state.c | 10 +++++-----
dlls/wined3d/stateblock.c | 2 +-
include/wine/wined3d.h | 11 +++++------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 4c64261..034fd34 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -155,19 +155,19 @@ static void state_shademode(struct wined3d_context *context, const struct wined3
{
switch (state->render_states[WINED3D_RS_SHADEMODE])
{
- case WINED3DSHADE_FLAT:
+ case WINED3D_SHADE_FLAT:
glShadeModel(GL_FLAT);
checkGLcall("glShadeModel(GL_FLAT)");
break;
- case WINED3DSHADE_GOURAUD:
+ case WINED3D_SHADE_GOURAUD:
glShadeModel(GL_SMOOTH);
checkGLcall("glShadeModel(GL_SMOOTH)");
break;
- case WINED3DSHADE_PHONG:
- FIXME("WINED3DSHADE_PHONG isn't supported\n");
+ case WINED3D_SHADE_PHONG:
+ FIXME("WINED3D_SHADE_PHONG isn't supported.\n");
break;
default:
- FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %#x.\n",
+ FIXME("Unrecognized shade mode %#x.\n",
state->render_states[WINED3D_RS_SHADEMODE]);
}
}
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 8a6bad8..4399446 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1124,7 +1124,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
else
state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE;
state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID;
- state->render_states[WINED3D_RS_SHADEMODE] = WINED3DSHADE_GOURAUD;
+ state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD;
lp.lp.repeat_factor = 0;
lp.lp.line_pattern = 0;
state->render_states[WINED3D_RS_LINEPATTERN] = lp.d;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 312f978..9ff53784 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -448,13 +448,12 @@ enum wined3d_fog_mode
WINED3D_FOG_LINEAR = 3,
};
-typedef enum _WINED3DSHADEMODE
+enum wined3d_shade_mode
{
- WINED3DSHADE_FLAT = 1,
- WINED3DSHADE_GOURAUD = 2,
- WINED3DSHADE_PHONG = 3,
- WINED3DSHADE_FORCE_DWORD = 0x7fffffff
-} WINED3DSHADEMODE;
+ WINED3D_SHADE_FLAT = 1,
+ WINED3D_SHADE_GOURAUD = 2,
+ WINED3D_SHADE_PHONG = 3,
+};
typedef enum _WINED3DFILLMODE
{
--
1.7.3.4
More information about the wine-patches
mailing list