Module: wine Branch: master Commit: 7acf39c4304e72163e577b9a5ca88d5ead6edb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acf39c4304e72163e577b9a5c...
Author: Józef Kucia jkucia@codeweavers.com Date: Wed Jul 27 23:33:47 2016 +0200
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
---
dlls/d3d11/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 41a0319..187b3f0 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -836,7 +836,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon { 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_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_MULTISAMPLEANTIALIAS, FALSE); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ANTIALIASEDLINEENABLE, FALSE); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4096caf..54ce2ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -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); checkGLcall("glDisable GL_CULL_FACE"); break; - case WINED3D_CULL_CW: + case WINED3D_CULL_FRONT: gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); gl_info->gl_ops.gl.p_glCullFace(GL_FRONT); checkGLcall("glCullFace(GL_FRONT)"); break; - case WINED3D_CULL_CCW: + case WINED3D_CULL_BACK: gl_info->gl_ops.gl.p_glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); gl_info->gl_ops.gl.p_glCullFace(GL_BACK); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index bb15995..2fbfa2c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -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_SRCBLEND] = WINED3D_BLEND_ONE; 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_ALPHAFUNC] = WINED3D_CMP_ALWAYS; state->render_states[WINED3D_RS_ALPHAREF] = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 52c20a4..e2f1004 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -462,8 +462,8 @@ enum wined3d_fill_mode enum wined3d_cull { WINED3D_CULL_NONE = 1, - WINED3D_CULL_CW = 2, - WINED3D_CULL_CCW = 3, + WINED3D_CULL_FRONT = 2, + WINED3D_CULL_BACK = 3, };
enum wined3d_stencil_op