[PATCH] WineD3D: Move material application to the vertex =

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 10:13:01 CDT 2008


pipeline=0A=
=0A=
---=0A=
 dlls/wined3d/state.c |    6 ++++--=0A=
 1 files changed, 4 insertions(+), 2 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 47fb87f..2b1adba 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3849,7 +3849,7 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /* 26, WINED3DRS_DITHERENABLE                 */      =
STATE_RENDER(WINED3DRS_DITHERENABLE),               state_ditherenable  =
},=0A=
     { /* 27, WINED3DRS_ALPHABLENDENABLE             */      =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE),           NULL                =
},=0A=
     { /* 28, WINED3DRS_FOGENABLE                    */      =
STATE_RENDER(WINED3DRS_FOGENABLE),                  state_fog           =
},=0A=
-    { /* 29, WINED3DRS_SPECULARENABLE               */      =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             =
state_specularenable},=0A=
+    { /* 29, WINED3DRS_SPECULARENABLE               */      =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             NULL                =
},=0A=
     { /* 30, WINED3DRS_ZVISIBLE                     */      0 /* Not =
supported according to the msdn */,        state_nogl          },=0A=
     { /* 31, WINED3DRS_SUBPIXEL                     */      =
STATE_RENDER(WINED3DRS_SUBPIXEL),                   state_subpixel      =
},=0A=
     { /* 32, WINED3DRS_SUBPIXELX                    */      =
STATE_RENDER(WINED3DRS_SUBPIXELX),                  state_subpixelx     =
},=0A=
@@ -4887,7 +4887,7 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /* STATE_CLIPPLANE(30)                        */      =
STATE_CLIPPLANE(30),                                clipplane           =
},=0A=
     { /* STATE_CLIPPLANE(31)                        */      =
STATE_CLIPPLANE(31),                                clipplane           =
},=0A=
 =0A=
-    { /* STATE_MATERIAL                             */      =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             =
state_specularenable},=0A=
+    { /* STATE_MATERIAL                             */      =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             NULL                =
},=0A=
     { /* STATE_FRONTFACE                            */      =
STATE_FRONTFACE,                                    frontface           =
},=0A=
 };=0A=
 =0A=
@@ -4910,6 +4910,8 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
 const struct StateEntryTemplate ffp_vertexstate_template[] =3D {=0A=
     { STATE_VDECL,                                        { =
STATE_VDECL,                                        vertexdeclaration   =
}},=0A=
     { STATE_VSHADER,                                      { =
STATE_VDECL,                                        vertexdeclaration   =
}},=0A=
+    { STATE_MATERIAL,                                     { =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             =
state_specularenable}},=0A=
+    { STATE_RENDER(WINED3DRS_SPECULARENABLE),             { =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             =
state_specularenable}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_004D_01C8E026.8CF45120--




More information about the wine-patches mailing list