Commit 2ac48e81 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

wined3d: Move WINED3DRS_ZFUNCENABLE to the state table.

parent 8879c7d8
......@@ -3443,18 +3443,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case WINED3DRS_SHADEMODE :
case WINED3DRS_DITHERENABLE :
case WINED3DRS_ZWRITEENABLE :
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
case WINED3DRS_ZFUNC :
{
int glParm = CompareFunc(Value);
if(glParm) {
glDepthFunc(glParm);
checkGLcall("glDepthFunc");
}
}
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
case WINED3DRS_AMBIENT :
......
......@@ -195,6 +195,15 @@ static void state_zwritenable(DWORD state, IWineD3DStateBlockImpl *stateblock) {
}
}
static void state_zfunc(DWORD state, IWineD3DStateBlockImpl *stateblock) {
int glParm = CompareFunc(stateblock->renderState[WINED3DRS_ZFUNC]);
if(glParm) {
glDepthFunc(glParm);
checkGLcall("glDepthFunc");
}
}
const struct StateEntry StateTable[] =
{
/* State name representative, apply function */
......@@ -221,7 +230,7 @@ const struct StateEntry StateTable[] =
{ /* 20, WINED3DRS_DESTBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_unknown },
{ /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined },
{ /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode },
{ /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_unknown },
{ /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc },
{ /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown },
{ /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_unknown },
{ /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable },
......
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