[PATCH] WineD3D: Move lights to the vertex pipeline states=0A=

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 12:15:34 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   25 +++++++++++++++++--------=0A=
 1 files changed, 17 insertions(+), 8 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 4b53282..94798a4 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -4843,14 +4843,14 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /*   , STATE_VERTEXSHADERCONSTANT             */      =
STATE_VERTEXSHADERCONSTANT,                         shaderconstant      =
},=0A=
     { /*   , STATE_PIXELSHADERCONSTANT              */      =
STATE_VERTEXSHADERCONSTANT,                         shaderconstant      =
},=0A=
       /* Lights */=0A=
-    { /*   , STATE_ACTIVELIGHT(0)                   */      =
STATE_ACTIVELIGHT(0),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(1)                   */      =
STATE_ACTIVELIGHT(1),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(2)                   */      =
STATE_ACTIVELIGHT(2),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(3)                   */      =
STATE_ACTIVELIGHT(3),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(4)                   */      =
STATE_ACTIVELIGHT(4),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(5)                   */      =
STATE_ACTIVELIGHT(5),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(6)                   */      =
STATE_ACTIVELIGHT(6),                               light               =
},=0A=
-    { /*   , STATE_ACTIVELIGHT(7)                   */      =
STATE_ACTIVELIGHT(7),                               light               =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(0)                   */      =
STATE_ACTIVELIGHT(0),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(1)                   */      =
STATE_ACTIVELIGHT(1),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(2)                   */      =
STATE_ACTIVELIGHT(2),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(3)                   */      =
STATE_ACTIVELIGHT(3),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(4)                   */      =
STATE_ACTIVELIGHT(4),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(5)                   */      =
STATE_ACTIVELIGHT(5),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(6)                   */      =
STATE_ACTIVELIGHT(6),                               NULL                =
},=0A=
+    { /*   , STATE_ACTIVELIGHT(7)                   */      =
STATE_ACTIVELIGHT(7),                               NULL                =
},=0A=
 =0A=
     { /* Scissor rect                               */      =
STATE_SCISSORRECT,                                  NULL                =
},=0A=
       /* Clip planes */=0A=
@@ -4947,6 +4947,15 @@ const struct StateEntryTemplate =
ffp_vertexstate_template[] =3D {=0A=
     { STATE_CLIPPLANE(29),                                { =
STATE_CLIPPLANE(29),                                clipplane           =
}},=0A=
     { STATE_CLIPPLANE(30),                                { =
STATE_CLIPPLANE(30),                                clipplane           =
}},=0A=
     { STATE_CLIPPLANE(31),                                { =
STATE_CLIPPLANE(31),                                clipplane           =
}},=0A=
+      /* Lights */=0A=
+    { STATE_ACTIVELIGHT(0),                               { =
STATE_ACTIVELIGHT(0),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(1),                               { =
STATE_ACTIVELIGHT(1),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(2),                               { =
STATE_ACTIVELIGHT(2),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(3),                               { =
STATE_ACTIVELIGHT(3),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(4),                               { =
STATE_ACTIVELIGHT(4),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(5),                               { =
STATE_ACTIVELIGHT(5),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(6),                               { =
STATE_ACTIVELIGHT(6),                               light               =
}},=0A=
+    { STATE_ACTIVELIGHT(7),                               { =
STATE_ACTIVELIGHT(7),                               light               =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_003F_01C8E026.83A42190--




More information about the wine-patches mailing list