[PATCH] WineD3D: WINED3DTSS_TEXCOORDINDEX belongs to the vertex =

Stefan Doesinger stefan at codeweavers.com
Fri Jul 4 16:33:40 CDT 2008


pipeline=0A=
=0A=
---=0A=
 dlls/wined3d/state.c |   16 ++++++++--------=0A=
 1 files changed, 8 insertions(+), 8 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 56fe01b..25229ae 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -4270,6 +4270,14 @@ const struct StateEntryTemplate =
ffp_vertexstate_template[] =3D {=0A=
     { =
STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(W=
INED3DTS_TEXTURE5),              transform_texture   }},=0A=
     { =
STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(W=
INED3DTS_TEXTURE6),              transform_texture   }},=0A=
     { =
STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(W=
INED3DTS_TEXTURE7),              transform_texture   }},=0A=
+    { STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(3, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(3, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(4, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(4, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(5, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(5, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(6, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(6, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
+    { STATE_TEXTURESTAGE(7, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(7, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
       /* Fog */=0A=
     { STATE_RENDER(WINED3DRS_FOGENABLE),                  { =
STATE_RENDER(WINED3DRS_FOGENABLE),                  state_fog           =
}},=0A=
     { STATE_RENDER(WINED3DRS_FOGTABLEMODE),               { =
STATE_RENDER(WINED3DRS_FOGENABLE),                  state_fog           =
}},=0A=
@@ -4322,7 +4330,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4339,7 +4346,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(1, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4356,7 +4362,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(2, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4373,7 +4378,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(3, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(3, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(3, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4390,7 +4394,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(4, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(4, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(4, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4407,7 +4410,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(5, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(5, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(5, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4424,7 +4426,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(6, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(6, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(6, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
@@ -4441,7 +4442,6 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT01),     { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10),     { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11),     { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00),     tex_bumpenvmat      =
}},=0A=
-    { STATE_TEXTURESTAGE(7, WINED3DTSS_TEXCOORDINDEX),    { =
STATE_TEXTURESTAGE(7, WINED3DTSS_TEXCOORDINDEX),    tex_coordindex      =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE),    { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE),    tex_bumpenvlscale   =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET),   { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET),   tex_bumpenvloffset  =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_COLORARG0),        { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_001D_01C8E33C.7D1218A0--




More information about the wine-patches mailing list