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

wined3d: Rename wined3d_cull enum values. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-07-27 23:33:47 +02:00 committed by Alexandre Julliard
parent 0ce9055263
commit 7acf39c430
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d11/device.c
View File

@ -836,7 +836,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon
{ {
wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_rasterizer_state(device->wined3d_device, NULL);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_BACK);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEANTIALIAS, FALSE);
wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE);

4
dlls/wined3d/state.c
View File

@ -194,13 +194,13 @@ static void state_cullmode(struct wined3d_context *context, const struct wined3d
gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE);
checkGLcall("glDisable GL_CULL_FACE"); checkGLcall("glDisable GL_CULL_FACE");
break; break;
case WINED3D_CULL_CW: case WINED3D_CULL_FRONT:
gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE"); checkGLcall("glEnable GL_CULL_FACE");
gl_info->gl_ops.gl.p_glCullFace(GL_FRONT); gl_info->gl_ops.gl.p_glCullFace(GL_FRONT);
checkGLcall("glCullFace(GL_FRONT)"); checkGLcall("glCullFace(GL_FRONT)");
break; break;
case WINED3D_CULL_CCW: case WINED3D_CULL_BACK:
gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE"); checkGLcall("glEnable GL_CULL_FACE");
gl_info->gl_ops.gl.p_glCullFace(GL_BACK); gl_info->gl_ops.gl.p_glCullFace(GL_BACK);

2
dlls/wined3d/stateblock.c
View File

@ -1083,7 +1083,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d
state->render_states[WINED3D_RS_LASTPIXEL] = TRUE; state->render_states[WINED3D_RS_LASTPIXEL] = TRUE;
state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE; state->render_states[WINED3D_RS_SRCBLEND] = WINED3D_BLEND_ONE;
state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO; state->render_states[WINED3D_RS_DESTBLEND] = WINED3D_BLEND_ZERO;
state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_CCW; state->render_states[WINED3D_RS_CULLMODE] = WINED3D_CULL_BACK;
state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL; state->render_states[WINED3D_RS_ZFUNC] = WINED3D_CMP_LESSEQUAL;
state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAFUNC] = WINED3D_CMP_ALWAYS;
state->render_states[WINED3D_RS_ALPHAREF] = 0; state->render_states[WINED3D_RS_ALPHAREF] = 0;

4
include/wine/wined3d.h
View File

@ -462,8 +462,8 @@ enum wined3d_fill_mode
enum wined3d_cull enum wined3d_cull
{ {
WINED3D_CULL_NONE = 1, WINED3D_CULL_NONE = 1,
WINED3D_CULL_CW = 2, WINED3D_CULL_FRONT = 2,
WINED3D_CULL_CCW = 3, WINED3D_CULL_BACK = 3,
}; };
enum wined3d_stencil_op enum wined3d_stencil_op