Stefan Dösinger : wined3d: Move shader constants to the misc states.

[Alexandre Julliard]

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

Author: Stefan Dösinger 
Date:   Wed Jul  2 13:07:41 2008 -0500

wined3d: Move shader constants to the misc states.

---

dlls/wined3d/state.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 94798a4..e830268 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4840,8 +4840,8 @@ const struct StateEntry FFPStateTable[] =
     { /*   , STATE_VDECL                            */      STATE_VDECL,                                        NULL                },
     { /*   , STATE_VSHADER                          */      STATE_VDECL,                                        NULL                },
     { /*   , STATE_VIEWPORT                         */      STATE_VIEWPORT,                                     viewport            },
-    { /*   , STATE_VERTEXSHADERCONSTANT             */      STATE_VERTEXSHADERCONSTANT,                         shaderconstant      },
-    { /*   , STATE_PIXELSHADERCONSTANT              */      STATE_VERTEXSHADERCONSTANT,                         shaderconstant      },
+    { /*   , STATE_VERTEXSHADERCONSTANT             */      STATE_VERTEXSHADERCONSTANT,                         NULL                },
+    { /*   , STATE_PIXELSHADERCONSTANT              */      STATE_VERTEXSHADERCONSTANT,                         NULL                },
       /* Lights */
     { /*   , STATE_ACTIVELIGHT(0)                   */      STATE_ACTIVELIGHT(0),                               NULL                },
     { /*   , STATE_ACTIVELIGHT(1)                   */      STATE_ACTIVELIGHT(1),                               NULL                },
@@ -4906,6 +4906,11 @@ const struct StateEntryTemplate misc_state_template[] = {
     { STATE_VDECL,                                        { STATE_VDECL,                                        streamsrc           }},
     { STATE_FRONTFACE,                                    { STATE_FRONTFACE,                                    frontface           }},
     { STATE_SCISSORRECT,                                  { STATE_SCISSORRECT,                                  scissorrect         }},
+    /* TODO: Move shader constant loading to vertex and fragment pipeline repectively, as soon as the pshader and
+     * vshader loadings are untied from each other
+     */
+    { STATE_VERTEXSHADERCONSTANT,                         { STATE_VERTEXSHADERCONSTANT,                         shaderconstant      }},
+    { STATE_PIXELSHADERCONSTANT,                          { STATE_VERTEXSHADERCONSTANT,                         shaderconstant      }},
     {0 /* Terminate */,                                   { 0,                                                  0                   }},
 };