Stefan Dösinger : wined3d: Do not warn about unsupported point sizes if the default values are set.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jan 10 15:47:12 CST 2007


Module: wine
Branch: master
Commit: 953f8d7b37aede5a9626c822dd9617e9e9ff925f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=953f8d7b37aede5a9626c822dd9617e9e9ff925f

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Wed Jan 10 11:32:07 2007 +0100

wined3d: Do not warn about unsupported point sizes if the default values are set.

---

 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 0e323cf..fc6439c 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -929,17 +929,16 @@ static void state_psizemin(DWORD state,
         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,
         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);
     }
 }
 




More information about the wine-cvs mailing list