[31/47] WineD3D: Move WINED3DRS_MULTISAMPLEANTIALIAS to the state
table
Stefan Dösinger
stefan at codeweavers.com
Sun Dec 10 16:20:40 CST 2006
-------------- next part --------------
From 7113c5621d937a7fa0163a66684db84bac8076cb Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 10 Dec 2006 19:22:44 +0100
Subject: [PATCH] WineD3D: Move WINED3DRS_MULTISAMPLEANTIALIAS to the state table
---
dlls/wined3d/device.c | 19 +------------------
dlls/wined3d/state.c | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 3a059df..2ed9ddd 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3423,6 +3423,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
case WINED3DRS_WRAP13 :
case WINED3DRS_WRAP14 :
case WINED3DRS_WRAP15 :
+ case WINED3DRS_MULTISAMPLEANTIALIAS :
StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
break;
@@ -3433,24 +3434,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
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 :
{
if(Value) {
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 496874a..d61cf59 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1099,6 +1099,22 @@ static void state_wrap(DWORD state, IWin
}
}
+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[] =
{
/* State name representative, apply function */
@@ -1265,7 +1281,7 @@ const struct StateEntry StateTable[] =
{ /*158, WINED3DRS_POINTSCALE_A */ 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 },
- { /*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 },
{ /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_unknown },
{ /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_unknown },
--
1.4.2.4
More information about the wine-patches
mailing list