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

wined3d: Move WINED3DRS_MULTISAMPLEANTIALIAS to the state table.

parent 81dce718
...@@ -3423,6 +3423,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3423,6 +3423,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
case WINED3DRS_WRAP13 : case WINED3DRS_WRAP13 :
case WINED3DRS_WRAP14 : case WINED3DRS_WRAP14 :
case WINED3DRS_WRAP15 : case WINED3DRS_WRAP15 :
case WINED3DRS_MULTISAMPLEANTIALIAS :
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break; break;
...@@ -3433,24 +3434,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W ...@@ -3433,24 +3434,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, W
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
case WINED3DRS_MULTISAMPLEANTIALIAS :
{
if( GL_SUPPORT(ARB_MULTISAMPLE) ) {
if(Value) {
glEnable(GL_MULTISAMPLE_ARB);
checkGLcall("glEnable(GL_MULTISAMPLE_ARB)");
} else {
glDisable(GL_MULTISAMPLE_ARB);
checkGLcall("glDisable(GL_MULTISAMPLE_ARB)");
}
} else {
if(Value) {
ERR("Multisample antialiasing not supported by gl\n");
}
}
break;
}
case WINED3DRS_SCISSORTESTENABLE : case WINED3DRS_SCISSORTESTENABLE :
{ {
if(Value) { if(Value) {
......
...@@ -1099,6 +1099,22 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock) { ...@@ -1099,6 +1099,22 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock) {
} }
} }
static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock) {
if( GL_SUPPORT(ARB_MULTISAMPLE) ) {
if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {
glEnable(GL_MULTISAMPLE_ARB);
checkGLcall("glEnable(GL_MULTISAMPLE_ARB)");
} else {
glDisable(GL_MULTISAMPLE_ARB);
checkGLcall("glDisable(GL_MULTISAMPLE_ARB)");
}
} else {
if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {
ERR("Multisample antialiasing not supported by gl\n");
}
}
}
const struct StateEntry StateTable[] = const struct StateEntry StateTable[] =
{ {
/* State name representative, apply function */ /* State name representative, apply function */
...@@ -1265,7 +1281,7 @@ const struct StateEntry StateTable[] = ...@@ -1265,7 +1281,7 @@ const struct StateEntry StateTable[] =
{ /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*158, WINED3DRS_POINTSCALE_A */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
{ /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*159, WINED3DRS_POINTSCALE_B */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
{ /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },
{ /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_unknown }, { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa },
{ /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_unknown }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_unknown },
{ /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown }, { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown },
{ /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown }, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown },
......
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