Stefan Dösinger : wined3d: Test for multisampling in the template.
Alexandre Julliard
julliard at winehq.org
Thu Jul 17 06:38:15 CDT 2008
Module: wine
Branch: master
Commit: d247953687fd657cb7b27564b3a9a4cf4a1f984b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d247953687fd657cb7b27564b3a9a4cf4a1f984b
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sat Jul 5 15:59:21 2008 -0500
wined3d: Test for multisampling in the template.
---
dlls/wined3d/state.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 93ce543..9caa24b 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1633,19 +1633,19 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC
}
}
-static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
- 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)");
- }
+static void state_msaa_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
+ if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {
+ WARN("Multisample antialiasing not supported by gl\n");
+ }
+}
+
+static void state_msaa(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) {
+ if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {
+ glEnable(GL_MULTISAMPLE_ARB);
+ checkGLcall("glEnable(GL_MULTISAMPLE_ARB)");
} else {
- if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) {
- WARN("Multisample antialiasing not supported by gl\n");
- }
+ glDisable(GL_MULTISAMPLE_ARB);
+ checkGLcall("glDisable(GL_MULTISAMPLE_ARB)");
}
}
@@ -3940,7 +3940,8 @@ const struct StateEntryTemplate misc_state_template[] = {
{ STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 },
{ STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 },
{ STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 },
- { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, 0 },
+ { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE },
+ { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa_w }, 0 },
{ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, 0 },
{ STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 },
{ STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX },
More information about the wine-cvs
mailing list