[PATCH] WineD3D: Test for multisampling in the template=0A=
Stefan Doesinger
stefan at codeweavers.com
Sat Jul 5 15:59:21 CDT 2008
=0A=
---=0A=
dlls/wined3d/state.c | 27 ++++++++++++++-------------=0A=
1 files changed, 14 insertions(+), 13 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index f5b87cf..2e99d28 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -1633,19 +1633,19 @@ static void state_wrap(DWORD state, =
IWineD3DStateBlockImpl *stateblock, WineD3DC=0A=
}=0A=
}=0A=
=0A=
-static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
- if( GL_SUPPORT(ARB_MULTISAMPLE) ) {=0A=
- if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {=0A=
- glEnable(GL_MULTISAMPLE_ARB);=0A=
- checkGLcall("glEnable(GL_MULTISAMPLE_ARB)");=0A=
- } else {=0A=
- glDisable(GL_MULTISAMPLE_ARB);=0A=
- checkGLcall("glDisable(GL_MULTISAMPLE_ARB)");=0A=
- }=0A=
+static void state_msaa_w(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
+ if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {=0A=
+ WARN("Multisample antialiasing not supported by gl\n");=0A=
+ }=0A=
+}=0A=
+=0A=
+static void state_msaa(DWORD state, IWineD3DStateBlockImpl *stateblock, =
WineD3DContext *context) {=0A=
+ if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {=0A=
+ glEnable(GL_MULTISAMPLE_ARB);=0A=
+ checkGLcall("glEnable(GL_MULTISAMPLE_ARB)");=0A=
} else {=0A=
- if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {=0A=
- WARN("Multisample antialiasing not supported by gl\n");=0A=
- }=0A=
+ glDisable(GL_MULTISAMPLE_ARB);=0A=
+ checkGLcall("glDisable(GL_MULTISAMPLE_ARB)");=0A=
}=0A=
}=0A=
=0A=
@@ -3939,7 +3939,8 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
{ STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}, 0 },=0A=
- { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa =
}, 0 },=0A=
+ { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa =
}, ARB_MULTISAMPLE },=0A=
+ { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa_w =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { =
STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_BLENDOP), { =
STATE_RENDER(WINED3DRS_BLENDOP), state_blendop =
}, EXT_BLEND_MINMAX },=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0005_01C8E609.DA1E6BA0--
More information about the wine-patches
mailing list