[8/15] WineD3D: Do not warn about unsupported point sizes if the default values are set

Stefan Dösinger stefan at codeweavers.com
Wed Jan 10 04:32:07 CST 2007


-------------- next part --------------
From e6513bb38841b911153499fc6a9a1f993a13d08d Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 7 Jan 2007 13:32:21 +0100
Subject: [PATCH] WineD3D: Do not warn about unsupported pointsizes if the default values

are used
---
 dlls/wined3d/state.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index e8914c7..8029313 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -929,17 +929,16 @@ static void state_psizemin(DWORD state, IWineD3DStateBlockImpl *stateblock) {
         float f;
     } tmpvalue;
 
+    tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN];
     if(GL_SUPPORT(ARB_POINT_PARAMETERS)) {
-        tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN];
         GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f);
         checkGLcall("glPointParameterfARB(...");
     }
     else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) {
-        tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN];
         GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f);
         checkGLcall("glPointParameterfEXT(...);");
-    } else {
-        FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl\n");
+    } else if(tmpvalue.f != 1.0) {
+        FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl, value is %f\n", tmpvalue.f);
     }
 }
 
@@ -949,17 +948,16 @@ static void state_psizemax(DWORD state, IWineD3DStateBlockImpl *stateblock) {
         float f;
     } tmpvalue;
 
+    tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX];
     if(GL_SUPPORT(ARB_POINT_PARAMETERS)) {
-        tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX];
         GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f);
         checkGLcall("glPointParameterfARB(...");
     }
     else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) {
-        tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX];
         GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f);
         checkGLcall("glPointParameterfEXT(...);");
-    } else {
-        FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl\n");
+    } else if(tmpvalue.f != 64.0) {
+        FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl, value is %f\n", tmpvalue.f);
     }
 }
 
-- 
1.4.4.3



More information about the wine-patches mailing list