[34/47] WineD3D: Move WINED3DRS_TEXTUREPERSPECTIVE to the state table

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


-------------- next part --------------
From 72adfcf8ae8e44b879230c865b53cab7b4875777 Mon Sep 17 00:00:00 2001
From: Stefan Doesinger <stefan at codeweavers.com>
Date: Sun, 10 Dec 2006 19:27:25 +0100
Subject: [PATCH] WineD3D: Move WINED3DRS_TEXTUREPERSPECTIVE to the state table

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

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index cc5f5c1..595f98a 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -3427,6 +3427,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl
     case WINED3DRS_SCISSORTESTENABLE :
     case WINED3DRS_SLOPESCALEDEPTHBIAS :
     case WINED3DRS_DEPTHBIAS :
+    case WINED3DRS_TEXTUREPERSPECTIVE    :
         StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock);
         break;
 
@@ -3437,15 +3438,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl
         return WINED3DERR_INVALIDCALL;
       }
 
-    case WINED3DRS_TEXTUREPERSPECTIVE    :
-    {
-        if (Value)
-            glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-        else
-            glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-        break;
-    }
-
     case WINED3DRS_STIPPLEDALPHA    :
     {
         if (Value)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 701c27c..3c1ae63 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -1144,6 +1144,16 @@ static void state_depthbias(DWORD state,
     }
 }
 
+static void state_perspective(DWORD state, IWineD3DStateBlockImpl *stateblock) {
+    if (stateblock->renderState[WINED3DRS_TEXTUREPERSPECTIVE]) {
+        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
+        checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST)");
+    } else {
+        glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+        checkGLcall("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST)");
+    }
+}
+
 const struct StateEntry StateTable[] =
 {
       /* State name                                         representative,                                     apply function */
@@ -1151,7 +1161,7 @@ const struct StateEntry StateTable[] =
     { /* 1,  WINED3DRS_TEXTUREHANDLE                */      0 /* Handled in ddraw */,                           state_undefined     },
     { /* 2,  WINED3DRS_ANTIALIAS                    */      STATE_RENDER(WINED3DRS_ANTIALIAS),                  state_unknown       },
     { /* 3,  WINED3DRS_TEXTUREADDRESS               */      0 /* Handled in ddraw */,                           state_undefined     },
-    { /* 4,  WINED3DRS_TEXTUREPERSPECTIVE           */      STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         state_unknown       },
+    { /* 4,  WINED3DRS_TEXTUREPERSPECTIVE           */      STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         state_perspective   },
     { /* 5,  WINED3DRS_WRAPU                        */      STATE_RENDER(WINED3DRS_WRAPU),                      state_unknown       },
     { /* 6,  WINED3DRS_WRAPV                        */      STATE_RENDER(WINED3DRS_WRAPV),                      state_unknown       },
     { /* 7,  WINED3DRS_ZENABLE                      */      STATE_RENDER(WINED3DRS_ZENABLE),                    state_zenable       },
-- 
1.4.2.4



More information about the wine-patches mailing list