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

wined3d: Get rid of the WINED3DCULL typedef.

This commit is contained in:
Henri Verbeet 2012-01-03 23:06:54 +01:00 committed by Alexandre Julliard
parent 863578cc29
commit 808e926783
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wined3d/state.c
View File

@ -129,24 +129,24 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d
* offscreen / onscreen rendering switch. */
switch (state->render_states[WINED3D_RS_CULLMODE])
{
case WINED3DCULL_NONE:
case WINED3D_CULL_NONE:
glDisable(GL_CULL_FACE);
checkGLcall("glDisable GL_CULL_FACE");
break;
case WINED3DCULL_CW:
case WINED3D_CULL_CW:
glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE");
glCullFace(GL_FRONT);
checkGLcall("glCullFace(GL_FRONT)");
break;
case WINED3DCULL_CCW:
case WINED3D_CULL_CCW:
glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE");
glCullFace(GL_BACK);
checkGLcall("glCullFace(GL_BACK)");
break;
default:
FIXME("Unrecognized/Unhandled WINED3DCULL value %#x.\n",
FIXME("Unrecognized cull mode %#x.\n",
state->render_states[WINED3D_RS_CULLMODE]);
}
}

2
dlls/wined3d/stateblock.c
View File

@ -1133,7 +1133,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock)
state->render_states[WINED3D_RS_LASTPIXEL] = TRUE;
state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE;
state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO;
state->render_states[WINED3D_RS_CULLMODE] = WINED3DCULL_CCW;
state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW;
state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL;
state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS;
state->render_states[WINED3D_RS_ALPHAREF] = 0;

11
include/wine/wined3d.h
View File

@ -462,13 +462,12 @@ enum wined3d_fill_mode
WINED3D_FILL_SOLID = 3,
};
typedef enum _WINED3DCULL
enum wined3d_cull
{
WINED3DCULL_NONE = 1,
WINED3DCULL_CW = 2,
WINED3DCULL_CCW = 3,
WINED3DCULL_FORCE_DWORD = 0x7fffffff
} WINED3DCULL;
WINED3D_CULL_NONE = 1,
WINED3D_CULL_CW = 2,
WINED3D_CULL_CCW = 3,
};
typedef enum _WINED3DSTENCILOP
{