wined3d: correct check for GL ext. support in MULTISAMPLEANTIALIAS

Jan Zerebecki jan.wine at zerebecki.de
Mon Aug 7 17:06:09 CDT 2006


If this patch is rejected from inclusion, please tell me why, as i would have to
ask anyway.

From: Jan Zerebecki <jan.wine at zerebecki.de>
Changelog:
wined3d: correct check for GL ext. support in MULTISAMPLEANTIALIAS
renderstate and correct trace in WRAP* renderstate
---

 dlls/wined3d/device.c |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 4bff183..10d8546 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4363,24 +4363,31 @@ static HRESULT WINAPI IWineD3DDeviceImpl
 
     so far as I can tell, wrapping and texture-coordinate generate go hand in hand,
     */
-        TRACE("(%p)->(%s,%ld) Texture wraping not yet supported\n",This, debug_d3drenderstate(State), Value);
-    break;
-    case WINED3DRS_MULTISAMPLEANTIALIAS      :
     {
-        if (!GL_SUPPORT(ARB_MULTISAMPLE)) {
-            TRACE("Multisample antialiasing not supported\n");
-            break;
+        if(Value) {
+            ERR("(%p)->(%s,%ld) Texture wraping not yet supported\n",This, debug_d3drenderstate(State), Value);
         }
+        break;
+    }
 
-        if(Value) {
-            glEnable(GL_MULTISAMPLE_ARB);
-            checkGLcall("glEnable(GL_MULTISAMPLE_ARB)");
+    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 {
-            glDisable(GL_MULTISAMPLE_ARB);
-            checkGLcall("glDisable(GL_MULTISAMPLE_ARB)");
+            if(Value) {
+                ERR("Multisample antialiasing not supported by gl\n");
+            }
         }
         break;
     }
+
     case WINED3DRS_SCISSORTESTENABLE :
     {
         if(Value) {



More information about the wine-patches mailing list