Skip to content

W
wine-winehq
Commit 95099404 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard
Browse files
Options

wined3d: Move lights to the vertex pipeline states.

parent 298c953b
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 8 deletions
dlls/wined3d/state.c
View file @ 95099404
...@@ -4843,14 +4843,14 @@ const struct StateEntry FFPStateTable[] = ...@@ -4843,14 +4843,14 @@ const struct StateEntry FFPStateTable[] =
{ /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant },
{ /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant },
/* Lights */ /* Lights */
{ /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), light }, { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), NULL },
{ /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), light }, { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), NULL },
{ /* , STATE_ACTIVELIGHT(2) */ STATE_ACTIVELIGHT(2), light }, { /* , STATE_ACTIVELIGHT(2) */ STATE_ACTIVELIGHT(2), NULL },
{ /* , STATE_ACTIVELIGHT(3) */ STATE_ACTIVELIGHT(3), light }, { /* , STATE_ACTIVELIGHT(3) */ STATE_ACTIVELIGHT(3), NULL },
{ /* , STATE_ACTIVELIGHT(4) */ STATE_ACTIVELIGHT(4), light }, { /* , STATE_ACTIVELIGHT(4) */ STATE_ACTIVELIGHT(4), NULL },
{ /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), light }, { /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), NULL },
{ /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), light }, { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), NULL },
{ /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), light }, { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), NULL },
{ /* Scissor rect */ STATE_SCISSORRECT, NULL }, { /* Scissor rect */ STATE_SCISSORRECT, NULL },
/* Clip planes */ /* Clip planes */
...@@ -4947,6 +4947,15 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { ...@@ -4947,6 +4947,15 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = {
{ STATE_CLIPPLANE(29), { STATE_CLIPPLANE(29), clipplane }}, { STATE_CLIPPLANE(29), { STATE_CLIPPLANE(29), clipplane }},
{ STATE_CLIPPLANE(30), { STATE_CLIPPLANE(30), clipplane }}, { STATE_CLIPPLANE(30), { STATE_CLIPPLANE(30), clipplane }},
{ STATE_CLIPPLANE(31), { STATE_CLIPPLANE(31), 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 }}, {0 /* Terminate */, { 0, 0 }},
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment