Stefan Dösinger : wined3d: Move lights to the vertex pipeline states.
Alexandre Julliard
julliard at winehq.org
Tue Jul 8 06:10:50 CDT 2008
Module: wine
Branch: master
Commit: 95099404d58b3da3badc13ccdff131359fc3463b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=95099404d58b3da3badc13ccdff131359fc3463b
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Jul 2 12:15:34 2008 -0500
wined3d: Move lights to the vertex pipeline states.
---
dlls/wined3d/state.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 4b53282..94798a4 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4843,14 +4843,14 @@ const struct StateEntry FFPStateTable[] =
{ /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant },
{ /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant },
/* Lights */
- { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), light },
- { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), light },
- { /* , STATE_ACTIVELIGHT(2) */ STATE_ACTIVELIGHT(2), light },
- { /* , STATE_ACTIVELIGHT(3) */ STATE_ACTIVELIGHT(3), light },
- { /* , STATE_ACTIVELIGHT(4) */ STATE_ACTIVELIGHT(4), light },
- { /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), light },
- { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), light },
- { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), light },
+ { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), NULL },
+ { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), NULL },
+ { /* , STATE_ACTIVELIGHT(2) */ STATE_ACTIVELIGHT(2), NULL },
+ { /* , STATE_ACTIVELIGHT(3) */ STATE_ACTIVELIGHT(3), NULL },
+ { /* , STATE_ACTIVELIGHT(4) */ STATE_ACTIVELIGHT(4), NULL },
+ { /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), NULL },
+ { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), NULL },
+ { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), NULL },
{ /* Scissor rect */ STATE_SCISSORRECT, NULL },
/* Clip planes */
@@ -4947,6 +4947,15 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = {
{ STATE_CLIPPLANE(29), { STATE_CLIPPLANE(29), clipplane }},
{ STATE_CLIPPLANE(30), { STATE_CLIPPLANE(30), clipplane }},
{ STATE_CLIPPLANE(31), { STATE_CLIPPLANE(31), clipplane }},
+ /* Lights */
+ { STATE_ACTIVELIGHT(0), { STATE_ACTIVELIGHT(0), light }},
+ { STATE_ACTIVELIGHT(1), { STATE_ACTIVELIGHT(1), light }},
+ { STATE_ACTIVELIGHT(2), { STATE_ACTIVELIGHT(2), light }},
+ { STATE_ACTIVELIGHT(3), { STATE_ACTIVELIGHT(3), light }},
+ { STATE_ACTIVELIGHT(4), { STATE_ACTIVELIGHT(4), light }},
+ { STATE_ACTIVELIGHT(5), { STATE_ACTIVELIGHT(5), light }},
+ { STATE_ACTIVELIGHT(6), { STATE_ACTIVELIGHT(6), light }},
+ { STATE_ACTIVELIGHT(7), { STATE_ACTIVELIGHT(7), light }},
{0 /* Terminate */, { 0, 0 }},
};
More information about the wine-cvs
mailing list