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

wined3d: Move WINED3DRS_SCISSORTESTENABLE to the state table.

parent 0c1aba5f
...@@ -3424,6 +3424,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3424,6 +3424,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case WINED3DRS_WRAP14 : case WINED3DRS_WRAP14 :
case WINED3DRS_WRAP15 : case WINED3DRS_WRAP15 :
case WINED3DRS_MULTISAMPLEANTIALIAS : case WINED3DRS_MULTISAMPLEANTIALIAS :
case WINED3DRS_SCISSORTESTENABLE :
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break; break;
...@@ -3434,17 +3435,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3434,17 +3435,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
case WINED3DRS_SCISSORTESTENABLE :
{
if(Value) {
glEnable(GL_SCISSOR_TEST);
checkGLcall("glEnable(GL_SCISSOR_TEST)");
} else {
glDisable(GL_SCISSOR_TEST);
checkGLcall("glDisable(GL_SCISSOR_TEST)");
}
break;
}
case WINED3DRS_SLOPESCALEDEPTHBIAS : case WINED3DRS_SLOPESCALEDEPTHBIAS :
{ {
if(Value) { if(Value) {
......
...@@ -1115,6 +1115,16 @@ static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock) ...@@ -1115,6 +1115,16 @@ static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock)
} }
} }
static void state_scissor(DWORD state, IWineD3DStateBlockImpl *stateblock) {
if(stateblock->renderState[WINED3DRS_SCISSORTESTENABLE]) {
glEnable(GL_SCISSOR_TEST);
checkGLcall("glEnable(GL_SCISSOR_TEST)");
} else {
glDisable(GL_SCISSOR_TEST);
checkGLcall("glDisable(GL_SCISSOR_TEST)");
}
}
const struct StateEntry StateTable[] = const struct StateEntry StateTable[] =
{ {
/* State name representative, apply function */ /* State name representative, apply function */
...@@ -1296,7 +1306,7 @@ const struct StateEntry StateTable[] = ...@@ -1296,7 +1306,7 @@ const struct StateEntry StateTable[] =
{ /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_unknown }, { /*173, WINED3DRS_NORMALDEGREE */ STATE_RENDER(WINED3DRS_NORMALDEGREE), state_unknown },
/*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */ /*172, WINED3DRS_POSITIONORDER */ /* Value assigned to 2 state names */
/*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */ /*173, WINED3DRS_NORMALORDER */ /* Value assigned to 2 state names */
{ /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_unknown }, { /*174, WINED3DRS_SCISSORTESTENABLE */ STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor },
{ /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown }, { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_unknown },
{ /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }, { /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend },
{ /*177, undefined */ 0, state_undefined }, { /*177, undefined */ 0, state_undefined },
......
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