[PATCH 5/5] wined3d: Get rid of the WINED3DPATCHEDGESTYLE typedef.
Henri Verbeet
hverbeet at codeweavers.com
Wed Jan 4 16:34:56 CST 2012
---
dlls/wined3d/state.c | 2 +-
dlls/wined3d/stateblock.c | 2 +-
include/wine/wined3d.h | 9 ++++-----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 3c5220e..1bcecfd 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1826,7 +1826,7 @@ static void state_multisampmask(struct wined3d_context *context, const struct wi
static void state_patchedgestyle(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
{
- if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3DPATCHEDGE_DISCRETE)
+ if (state->render_states[WINED3D_RS_PATCHEDGESTYLE] != WINED3D_PATCH_EDGE_DISCRETE)
FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n",
state->render_states[WINED3D_RS_PATCHEDGESTYLE]);
}
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 1dd6b9c..d48464c 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -1197,7 +1197,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
state->render_states[WINED3D_RS_POINTSCALE_C] = tmpfloat.d;
state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS] = TRUE;
state->render_states[WINED3D_RS_MULTISAMPLEMASK] = 0xffffffff;
- state->render_states[WINED3D_RS_PATCHEDGESTYLE] = WINED3DPATCHEDGE_DISCRETE;
+ state->render_states[WINED3D_RS_PATCHEDGESTYLE] = WINED3D_PATCH_EDGE_DISCRETE;
tmpfloat.f = 1.0f;
state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d;
state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 254a839..6cc8a05 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -488,12 +488,11 @@ enum wined3d_material_color_source
WINED3D_MCS_COLOR2 = 2,
};
-typedef enum _WINED3DPATCHEDGESTYLE
+enum wined3d_patch_edge_style
{
- WINED3DPATCHEDGE_DISCRETE = 0,
- WINED3DPATCHEDGE_CONTINUOUS = 1,
- WINED3DPATCHEDGE_FORCE_DWORD = 0x7fffffff
-} WINED3DPATCHEDGESTYLE;
+ WINED3D_PATCH_EDGE_DISCRETE = 0,
+ WINED3D_PATCH_EDGE_CONTINUOUS = 1,
+};
typedef enum _WINED3DBACKBUFFER_TYPE
{
--
1.7.3.4
More information about the wine-patches
mailing list