[PATCH] WineD3D: a few more vertex states=0A=

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 22:11:56 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   36 ++++++++++++++++++++++++------------=0A=
 1 files changed, 24 insertions(+), 12 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 47905cb..785d640 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3958,23 +3958,23 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /*133, WINED3DRS_WRAP5                        */      =
STATE_RENDER(WINED3DRS_WRAP0),                      NULL                =
},=0A=
     { /*134, WINED3DRS_WRAP6                        */      =
STATE_RENDER(WINED3DRS_WRAP0),                      NULL                =
},=0A=
     { /*135, WINED3DRS_WRAP7                        */      =
STATE_RENDER(WINED3DRS_WRAP0),                      NULL                =
},=0A=
-    { /*136, WINED3DRS_CLIPPING                     */      =
STATE_RENDER(WINED3DRS_CLIPPING),                   state_clipping      =
},=0A=
-    { /*137, WINED3DRS_LIGHTING                     */      =
STATE_RENDER(WINED3DRS_LIGHTING),                   state_lighting      =
},=0A=
+    { /*136, WINED3DRS_CLIPPING                     */      =
STATE_RENDER(WINED3DRS_CLIPPING),                   NULL                =
},=0A=
+    { /*137, WINED3DRS_LIGHTING                     */      =
STATE_RENDER(WINED3DRS_LIGHTING),                   NULL                =
},=0A=
     { /*138, WINED3DRS_EXTENTS                      */      =
STATE_RENDER(WINED3DRS_EXTENTS),                    state_extents       =
},=0A=
-    { /*139, WINED3DRS_AMBIENT                      */      =
STATE_RENDER(WINED3DRS_AMBIENT),                    state_ambient       =
},=0A=
+    { /*139, WINED3DRS_AMBIENT                      */      =
STATE_RENDER(WINED3DRS_AMBIENT),                    NULL                =
},=0A=
     { /*140, WINED3DRS_FOGVERTEXMODE                */      =
STATE_RENDER(WINED3DRS_FOGENABLE),                  NULL                =
},=0A=
-    { /*141, WINED3DRS_COLORVERTEX                  */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
},=0A=
-    { /*142, WINED3DRS_LOCALVIEWER                  */      =
STATE_RENDER(WINED3DRS_LOCALVIEWER),                state_localviewer   =
},=0A=
-    { /*143, WINED3DRS_NORMALIZENORMALS             */      =
STATE_RENDER(WINED3DRS_NORMALIZENORMALS),           state_normalize     =
},=0A=
+    { /*141, WINED3DRS_COLORVERTEX                  */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                NULL                =
},=0A=
+    { /*142, WINED3DRS_LOCALVIEWER                  */      =
STATE_RENDER(WINED3DRS_LOCALVIEWER),                NULL                =
},=0A=
+    { /*143, WINED3DRS_NORMALIZENORMALS             */      =
STATE_RENDER(WINED3DRS_NORMALIZENORMALS),           NULL                =
},=0A=
     { /*144, WINED3DRS_COLORKEYBLENDENABLE          */      =
STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE),        state_ckeyblend     =
},=0A=
-    { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE        */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
},=0A=
-    { /*146, WINED3DRS_SPECULARMATERIALSOURCE       */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
},=0A=
-    { /*147, WINED3DRS_AMBIENTMATERIALSOURCE        */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
},=0A=
-    { /*148, WINED3DRS_EMISSIVEMATERIALSOURCE       */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
},=0A=
+    { /*145, WINED3DRS_DIFFUSEMATERIALSOURCE        */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                NULL                =
},=0A=
+    { /*146, WINED3DRS_SPECULARMATERIALSOURCE       */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                NULL                =
},=0A=
+    { /*147, WINED3DRS_AMBIENTMATERIALSOURCE        */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                NULL                =
},=0A=
+    { /*148, WINED3DRS_EMISSIVEMATERIALSOURCE       */      =
STATE_RENDER(WINED3DRS_COLORVERTEX),                NULL                =
},=0A=
     { /*149, Undefined                              */      0,          =
                                        state_undefined     },=0A=
     { /*150, Undefined                              */      0,          =
                                        state_undefined     },=0A=
-    { /*151, WINED3DRS_VERTEXBLEND                  */      =
STATE_RENDER(WINED3DRS_VERTEXBLEND),                state_vertexblend   =
},=0A=
-    { /*152, WINED3DRS_CLIPPLANEENABLE              */      =
STATE_RENDER(WINED3DRS_CLIPPING),                   state_clipping      =
},=0A=
+    { /*151, WINED3DRS_VERTEXBLEND                  */      =
STATE_RENDER(WINED3DRS_VERTEXBLEND),                NULL                =
},=0A=
+    { /*152, WINED3DRS_CLIPPLANEENABLE              */      =
STATE_RENDER(WINED3DRS_CLIPPING),                   NULL                =
},=0A=
     { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING     */      0,          =
                                        state_nogl          },=0A=
     { /*154, WINED3DRS_POINTSIZE                    */      =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           state_pscale        =
},=0A=
     { /*155, WINED3DRS_POINTSIZE_MIN                */      =
STATE_RENDER(WINED3DRS_POINTSIZE_MIN),              state_psizemin      =
},=0A=
@@ -5309,6 +5309,18 @@ const struct StateEntryTemplate =
ffp_vertexstate_template[] =3D {=0A=
     { STATE_RENDER(WINED3DRS_FOGCOLOR),                   { =
STATE_RENDER(WINED3DRS_FOGCOLOR),                   state_fogcolor      =
}},=0A=
     { STATE_RENDER(WINED3DRS_FOGDENSITY),                 { =
STATE_RENDER(WINED3DRS_FOGDENSITY),                 state_fogdensity    =
}},=0A=
     { STATE_RENDER(WINED3DRS_RANGEFOGENABLE),             { =
STATE_RENDER(WINED3DRS_RANGEFOGENABLE),             state_rangefog      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_CLIPPING),                   { =
STATE_RENDER(WINED3DRS_CLIPPING),                   state_clipping      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_CLIPPLANEENABLE),            { =
STATE_RENDER(WINED3DRS_CLIPPING),                   state_clipping      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_LIGHTING),                   { =
STATE_RENDER(WINED3DRS_LIGHTING),                   state_lighting      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_AMBIENT),                    { =
STATE_RENDER(WINED3DRS_AMBIENT),                    state_ambient       =
}},=0A=
+    { STATE_RENDER(WINED3DRS_COLORVERTEX),                { =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_LOCALVIEWER),                { =
STATE_RENDER(WINED3DRS_LOCALVIEWER),                state_localviewer   =
}},=0A=
+    { STATE_RENDER(WINED3DRS_NORMALIZENORMALS),           { =
STATE_RENDER(WINED3DRS_NORMALIZENORMALS),           state_normalize     =
}},=0A=
+    { STATE_RENDER(WINED3DRS_DIFFUSEMATERIALSOURCE),      { =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_SPECULARMATERIALSOURCE),     { =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_AMBIENTMATERIALSOURCE),      { =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_EMISSIVEMATERIALSOURCE),     { =
STATE_RENDER(WINED3DRS_COLORVERTEX),                state_colormat      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_VERTEXBLEND),                { =
STATE_RENDER(WINED3DRS_VERTEXBLEND),                state_vertexblend   =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0005_01C8E1AF.ADE48460--




More information about the wine-patches mailing list