Stefan Dösinger : wined3d: Move WINED3DRS_POINTSIZE_MIN to the state table.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Sun Dec 10 23:20:12 2006 +0100

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 6dc22cc..1d084f3 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..94f781f 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       },