Commit 02fb9f6f authored by Ivan Gyurdiev's avatar Ivan Gyurdiev Committed by Alexandre Julliard

wined3d: Add D3DCULL to the WINED3D namespace.

parent 16767d21
...@@ -3476,12 +3476,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3476,12 +3476,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
/* If we are culling "back faces with clockwise vertices" then /* If we are culling "back faces with clockwise vertices" then
set front faces to be counter clockwise and enable culling set front faces to be counter clockwise and enable culling
of back faces */ of back faces */
switch ((D3DCULL) Value) { switch ((WINED3DCULL) Value) {
case D3DCULL_NONE: case WINED3DCULL_NONE:
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
checkGLcall("glDisable GL_CULL_FACE"); checkGLcall("glDisable GL_CULL_FACE");
break; break;
case D3DCULL_CW: case WINED3DCULL_CW:
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE"); checkGLcall("glEnable GL_CULL_FACE");
if (This->renderUpsideDown) { if (This->renderUpsideDown) {
...@@ -3493,7 +3493,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3493,7 +3493,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
} }
glCullFace(GL_BACK); glCullFace(GL_BACK);
break; break;
case D3DCULL_CCW: case WINED3DCULL_CCW:
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
checkGLcall("glEnable GL_CULL_FACE"); checkGLcall("glEnable GL_CULL_FACE");
if (This->renderUpsideDown) { if (This->renderUpsideDown) {
...@@ -3506,7 +3506,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3506,7 +3506,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
glCullFace(GL_BACK); glCullFace(GL_BACK);
break; break;
default: default:
FIXME("Unrecognized/Unhandled D3DCULL value %d\n", Value); FIXME("Unrecognized/Unhandled WINED3DCULL value %d\n", Value);
} }
break; break;
......
...@@ -853,7 +853,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat ...@@ -853,7 +853,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat
IWineD3DDevice_SetRenderState(device, WINED3DRS_LASTPIXEL, TRUE); IWineD3DDevice_SetRenderState(device, WINED3DRS_LASTPIXEL, TRUE);
IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, WINED3DBLEND_ONE); IWineD3DDevice_SetRenderState(device, WINED3DRS_SRCBLEND, WINED3DBLEND_ONE);
IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, WINED3DBLEND_ZERO); IWineD3DDevice_SetRenderState(device, WINED3DRS_DESTBLEND, WINED3DBLEND_ZERO);
IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, D3DCULL_CCW); IWineD3DDevice_SetRenderState(device, WINED3DRS_CULLMODE, WINED3DCULL_CCW);
IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL); IWineD3DDevice_SetRenderState(device, WINED3DRS_ZFUNC, D3DCMP_LESSEQUAL);
IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAFUNC, D3DCMP_ALWAYS);
IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAREF, 0); IWineD3DDevice_SetRenderState(device, WINED3DRS_ALPHAREF, 0);
......
...@@ -505,6 +505,14 @@ typedef enum _WINED3DSHADEMODE { ...@@ -505,6 +505,14 @@ typedef enum _WINED3DSHADEMODE {
WINED3DSHADE_FORCE_DWORD = 0x7fffffff WINED3DSHADE_FORCE_DWORD = 0x7fffffff
} WINED3DSHADEMODE; } WINED3DSHADEMODE;
typedef enum _WINED3DCULL {
WINED3DCULL_NONE = 1,
WINED3DCULL_CW = 2,
WINED3DCULL_CCW = 3,
WINED3DCULL_FORCE_DWORD = 0x7fffffff
} WINED3DCULL;
typedef struct _WINED3DDISPLAYMODE { typedef struct _WINED3DDISPLAYMODE {
UINT Width; UINT Width;
UINT Height; UINT Height;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment