ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Get rid of the WINED3DPATCHEDGESTYLE typedef.

This commit is contained in:
Henri Verbeet 2012-01-04 23:34:56 +01:00 committed by Alexandre Julliard
parent c3cc92e472
commit c77b414787
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/state.c
View File

@ -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) 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", FIXME("WINED3D_RS_PATCHEDGESTYLE %#x not yet implemented.\n",
state->render_states[WINED3D_RS_PATCHEDGESTYLE]); state->render_states[WINED3D_RS_PATCHEDGESTYLE]);
} }

2
dlls/wined3d/stateblock.c
View File

@ -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_POINTSCALE_C] = tmpfloat.d;
state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS] = TRUE; state->render_states[WINED3D_RS_MULTISAMPLEANTIALIAS] = TRUE;
state->render_states[WINED3D_RS_MULTISAMPLEMASK] = 0xffffffff; 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; tmpfloat.f = 1.0f;
state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d; state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d;
state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe; state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe;

9
include/wine/wined3d.h
View File

@ -488,12 +488,11 @@ enum wined3d_material_color_source
WINED3D_MCS_COLOR2 = 2, WINED3D_MCS_COLOR2 = 2,
}; };
typedef enum _WINED3DPATCHEDGESTYLE enum wined3d_patch_edge_style
{ {
WINED3DPATCHEDGE_DISCRETE = 0, WINED3D_PATCH_EDGE_DISCRETE = 0,
WINED3DPATCHEDGE_CONTINUOUS = 1, WINED3D_PATCH_EDGE_CONTINUOUS = 1,
WINED3DPATCHEDGE_FORCE_DWORD = 0x7fffffff };
} WINED3DPATCHEDGESTYLE;
typedef enum _WINED3DBACKBUFFER_TYPE typedef enum _WINED3DBACKBUFFER_TYPE
{ {