[PATCH] WineD3D: move clipplanes to vertex states=0A=

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 12:10:42 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   97 =
+++++++++++++++++++++++++++++++++----------------=0A=
 1 files changed, 65 insertions(+), 32 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 41ac47d..c28edef 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -4854,38 +4854,38 @@ const struct StateEntry FFPStateTable[] =3D=0A=
 =0A=
     { /* Scissor rect                               */      =
STATE_SCISSORRECT,                                  scissorrect         =
},=0A=
       /* Clip planes */=0A=
-    { /* STATE_CLIPPLANE(0)                         */      =
STATE_CLIPPLANE(0),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(1)                         */      =
STATE_CLIPPLANE(1),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(2)                         */      =
STATE_CLIPPLANE(2),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(3)                         */      =
STATE_CLIPPLANE(3),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(4)                         */      =
STATE_CLIPPLANE(4),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(5)                         */      =
STATE_CLIPPLANE(5),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(6)                         */      =
STATE_CLIPPLANE(6),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(7)                         */      =
STATE_CLIPPLANE(7),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(8)                         */      =
STATE_CLIPPLANE(8),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(9)                         */      =
STATE_CLIPPLANE(9),                                 clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(10)                        */      =
STATE_CLIPPLANE(10),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(11)                        */      =
STATE_CLIPPLANE(11),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(12)                        */      =
STATE_CLIPPLANE(12),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(13)                        */      =
STATE_CLIPPLANE(13),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(14)                        */      =
STATE_CLIPPLANE(14),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(15)                        */      =
STATE_CLIPPLANE(15),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(16)                        */      =
STATE_CLIPPLANE(16),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(17)                        */      =
STATE_CLIPPLANE(17),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(18)                        */      =
STATE_CLIPPLANE(18),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(19)                        */      =
STATE_CLIPPLANE(19),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(20)                        */      =
STATE_CLIPPLANE(20),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(21)                        */      =
STATE_CLIPPLANE(21),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(22)                        */      =
STATE_CLIPPLANE(22),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(23)                        */      =
STATE_CLIPPLANE(23),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(24)                        */      =
STATE_CLIPPLANE(24),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(25)                        */      =
STATE_CLIPPLANE(25),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(26)                        */      =
STATE_CLIPPLANE(26),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(27)                        */      =
STATE_CLIPPLANE(27),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(28)                        */      =
STATE_CLIPPLANE(28),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(29)                        */      =
STATE_CLIPPLANE(29),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(30)                        */      =
STATE_CLIPPLANE(30),                                clipplane           =
},=0A=
-    { /* STATE_CLIPPLANE(31)                        */      =
STATE_CLIPPLANE(31),                                clipplane           =
},=0A=
+    { /* STATE_CLIPPLANE(0)                         */      =
STATE_CLIPPLANE(0),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(1)                         */      =
STATE_CLIPPLANE(1),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(2)                         */      =
STATE_CLIPPLANE(2),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(3)                         */      =
STATE_CLIPPLANE(3),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(4)                         */      =
STATE_CLIPPLANE(4),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(5)                         */      =
STATE_CLIPPLANE(5),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(6)                         */      =
STATE_CLIPPLANE(6),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(7)                         */      =
STATE_CLIPPLANE(7),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(8)                         */      =
STATE_CLIPPLANE(8),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(9)                         */      =
STATE_CLIPPLANE(9),                                 NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(10)                        */      =
STATE_CLIPPLANE(10),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(11)                        */      =
STATE_CLIPPLANE(11),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(12)                        */      =
STATE_CLIPPLANE(12),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(13)                        */      =
STATE_CLIPPLANE(13),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(14)                        */      =
STATE_CLIPPLANE(14),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(15)                        */      =
STATE_CLIPPLANE(15),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(16)                        */      =
STATE_CLIPPLANE(16),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(17)                        */      =
STATE_CLIPPLANE(17),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(18)                        */      =
STATE_CLIPPLANE(18),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(19)                        */      =
STATE_CLIPPLANE(19),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(20)                        */      =
STATE_CLIPPLANE(20),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(21)                        */      =
STATE_CLIPPLANE(21),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(22)                        */      =
STATE_CLIPPLANE(22),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(23)                        */      =
STATE_CLIPPLANE(23),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(24)                        */      =
STATE_CLIPPLANE(24),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(25)                        */      =
STATE_CLIPPLANE(25),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(26)                        */      =
STATE_CLIPPLANE(26),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(27)                        */      =
STATE_CLIPPLANE(27),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(28)                        */      =
STATE_CLIPPLANE(28),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(29)                        */      =
STATE_CLIPPLANE(29),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(30)                        */      =
STATE_CLIPPLANE(30),                                NULL                =
},=0A=
+    { /* STATE_CLIPPLANE(31)                        */      =
STATE_CLIPPLANE(31),                                NULL                =
},=0A=
 =0A=
     { /* STATE_MATERIAL                             */      =
STATE_RENDER(WINED3DRS_SPECULARENABLE),             NULL                =
},=0A=
     { /* STATE_FRONTFACE                            */      =
STATE_FRONTFACE,                                    NULL                =
},=0A=
@@ -4913,6 +4913,39 @@ const struct StateEntryTemplate =
ffp_vertexstate_template[] =3D {=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=
+      /* Clip planes */=0A=
+    { STATE_CLIPPLANE(0),                                 { =
STATE_CLIPPLANE(0),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(1),                                 { =
STATE_CLIPPLANE(1),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(2),                                 { =
STATE_CLIPPLANE(2),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(3),                                 { =
STATE_CLIPPLANE(3),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(4),                                 { =
STATE_CLIPPLANE(4),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(5),                                 { =
STATE_CLIPPLANE(5),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(6),                                 { =
STATE_CLIPPLANE(6),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(7),                                 { =
STATE_CLIPPLANE(7),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(8),                                 { =
STATE_CLIPPLANE(8),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(9),                                 { =
STATE_CLIPPLANE(9),                                 clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(10),                                { =
STATE_CLIPPLANE(10),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(11),                                { =
STATE_CLIPPLANE(11),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(12),                                { =
STATE_CLIPPLANE(12),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(13),                                { =
STATE_CLIPPLANE(13),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(14),                                { =
STATE_CLIPPLANE(14),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(15),                                { =
STATE_CLIPPLANE(15),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(16),                                { =
STATE_CLIPPLANE(16),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(17),                                { =
STATE_CLIPPLANE(17),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(18),                                { =
STATE_CLIPPLANE(18),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(19),                                { =
STATE_CLIPPLANE(19),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(20),                                { =
STATE_CLIPPLANE(20),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(21),                                { =
STATE_CLIPPLANE(21),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(22),                                { =
STATE_CLIPPLANE(22),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(23),                                { =
STATE_CLIPPLANE(23),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(24),                                { =
STATE_CLIPPLANE(24),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(25),                                { =
STATE_CLIPPLANE(25),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(26),                                { =
STATE_CLIPPLANE(26),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(27),                                { =
STATE_CLIPPLANE(27),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(28),                                { =
STATE_CLIPPLANE(28),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(29),                                { =
STATE_CLIPPLANE(29),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(30),                                { =
STATE_CLIPPLANE(30),                                clipplane           =
}},=0A=
+    { STATE_CLIPPLANE(31),                                { =
STATE_CLIPPLANE(31),                                clipplane           =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0099_01C8E027.75D181B0--




More information about the wine-patches mailing list