ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Move shader constants to the misc states.

This commit is contained in:
Stefan Dösinger 2008-07-02 13:07:41 -05:00 committed by Alexandre Julliard
parent 13fbba6847
commit 4b831a5d3e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/wined3d/state.c
View File

@ -4840,8 +4840,8 @@ const struct StateEntry FFPStateTable[] =
{ /* , STATE_VDECL */ STATE_VDECL, NULL }, { /* , STATE_VDECL */ STATE_VDECL, NULL },
{ /* , STATE_VSHADER */ STATE_VDECL, NULL }, { /* , STATE_VSHADER */ STATE_VDECL, NULL },
{ /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport },
{ /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, NULL },
{ /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, NULL },
/* Lights */ /* Lights */
{ /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), NULL }, { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), NULL },
{ /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), NULL }, { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), NULL },
@ -4906,6 +4906,11 @@ const struct StateEntryTemplate misc_state_template[] = {
{ STATE_VDECL, { STATE_VDECL, streamsrc }}, { STATE_VDECL, { STATE_VDECL, streamsrc }},
{ STATE_FRONTFACE, { STATE_FRONTFACE, frontface }}, { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }},
{ STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }}, { 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 }}, {0 /* Terminate */, { 0, 0 }},
}; };