[22/47] WineD3D: Move WINED3DRS_POINTSIZE_MIN to the state table

Stefan Dösinger stefan at codeweavers.com
Sun Dec 10 16:20:12 CST 2006


-------------- next part --------------
From 5a31854e44d66cb285f720eb241b4316640b16f8 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 10 Dec 2006 18:54:39 +0100
Subject: [PATCH] WineD3D: Move WINED3DRS_POINTSIZE_MIN to the state table

---
 dlls/wined3d/device.c |   11 +----------
 dlls/wined3d/state.c  |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 97c12b6..81b9211 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3393,17 +3393,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     case WINED3DRS_ZBIAS                     : /* D3D8 only */
     case WINED3DRS_NORMALIZENORMALS          :
     case WINED3DRS_POINTSIZE                 :
-        StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
-        break;
-
     case WINED3DRS_POINTSIZE_MIN             :
-        if (GL_SUPPORT(EXT_POINT_PARAMETERS)) {
-          tmpvalue.d = Value;
-          GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f);
-          checkGLcall("glPointParameterfEXT(...);");
-        } else {
-          FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl\n");
-        }
+        StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
         break;
 
     case WINED3DRS_POINTSIZE_MAX             :
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index ea03dfa..eec9851 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -920,6 +920,21 @@ static void state_psize(DWORD state, IWi
     checkGLcall("glPointSize(...);");
 }
 
+static void state_psizemin(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+    union {
+        DWORD d;
+        float f;
+    } tmpvalue;
+
+    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");
+    }
+}
+
 const struct StateEntry StateTable[] =
 {
       /* State name                                         representative,                                     apply function */
@@ -1080,7 +1095,7 @@ const struct StateEntry StateTable[] =
     { /*152, WINED3DRS_CLIPPLANEENABLE              */      STATE_RENDER(WINED3DRS_CLIPPING),                   state_clipping      },
     { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING     */      0,                                                  state_nogl          },
     { /*154, WINED3DRS_POINTSIZE                    */      STATE_RENDER(WINED3DRS_POINTSIZE),                  state_psize         },
-    { /*155, WINED3DRS_POINTSIZE_MIN                */      STATE_RENDER(WINED3DRS_POINTSIZE_MIN),              state_unknown       },
+    { /*155, WINED3DRS_POINTSIZE_MIN                */      STATE_RENDER(WINED3DRS_POINTSIZE_MIN),              state_psizemin      },
     { /*156, WINED3DRS_POINTSPRITEENABLE            */      STATE_RENDER(WINED3DRS_POINTSPRITEENABLE),          state_unknown       },
     { /*157, WINED3DRS_POINTSCALEENABLE             */      STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           state_unknown       },
     { /*158, WINED3DRS_POINTSCALE_A                 */      STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           state_unknown       },
-- 
1.4.2.4



More information about the wine-patches mailing list