[PATCH] WineD3D: Move a few more states to the misc pipeline=0A=

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 16:08:40 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   24 ++++++++++++++++--------=0A=
 1 files changed, 16 insertions(+), 8 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 32cdd3c..983a8db 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3829,14 +3829,14 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /* 4,  WINED3DRS_TEXTUREPERSPECTIVE           */      =
STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         NULL                =
},=0A=
     { /* 5,  WINED3DRS_WRAPU                        */      =
STATE_RENDER(WINED3DRS_WRAPU),                      state_wrapu         =
},=0A=
     { /* 6,  WINED3DRS_WRAPV                        */      =
STATE_RENDER(WINED3DRS_WRAPV),                      state_wrapv         =
},=0A=
-    { /* 7,  WINED3DRS_ZENABLE                      */      =
STATE_RENDER(WINED3DRS_ZENABLE),                    state_zenable       =
},=0A=
-    { /* 8,  WINED3DRS_FILLMODE                     */      =
STATE_RENDER(WINED3DRS_FILLMODE),                   state_fillmode      =
},=0A=
-    { /* 9,  WINED3DRS_SHADEMODE                    */      =
STATE_RENDER(WINED3DRS_SHADEMODE),                  state_shademode     =
},=0A=
-    { /* 10, WINED3DRS_LINEPATTERN                  */      =
STATE_RENDER(WINED3DRS_LINEPATTERN),                state_linepattern   =
},=0A=
-    { /* 11, WINED3DRS_MONOENABLE                   */      =
STATE_RENDER(WINED3DRS_MONOENABLE),                 state_monoenable    =
},=0A=
-    { /* 12, WINED3DRS_ROP2                         */      =
STATE_RENDER(WINED3DRS_ROP2),                       state_rop2          =
},=0A=
-    { /* 13, WINED3DRS_PLANEMASK                    */      =
STATE_RENDER(WINED3DRS_PLANEMASK),                  state_planemask     =
},=0A=
-    { /* 14, WINED3DRS_ZWRITEENABLE                 */      =
STATE_RENDER(WINED3DRS_ZWRITEENABLE),               state_zwritenable   =
},=0A=
+    { /* 7,  WINED3DRS_ZENABLE                      */      =
STATE_RENDER(WINED3DRS_ZENABLE),                    NULL                =
},=0A=
+    { /* 8,  WINED3DRS_FILLMODE                     */      =
STATE_RENDER(WINED3DRS_FILLMODE),                   NULL                =
},=0A=
+    { /* 9,  WINED3DRS_SHADEMODE                    */      =
STATE_RENDER(WINED3DRS_SHADEMODE),                  NULL                =
},=0A=
+    { /* 10, WINED3DRS_LINEPATTERN                  */      =
STATE_RENDER(WINED3DRS_LINEPATTERN),                NULL                =
},=0A=
+    { /* 11, WINED3DRS_MONOENABLE                   */      =
STATE_RENDER(WINED3DRS_MONOENABLE),                 NULL                =
},=0A=
+    { /* 12, WINED3DRS_ROP2                         */      =
STATE_RENDER(WINED3DRS_ROP2),                       NULL                =
},=0A=
+    { /* 13, WINED3DRS_PLANEMASK                    */      =
STATE_RENDER(WINED3DRS_PLANEMASK),                  NULL                =
},=0A=
+    { /* 14, WINED3DRS_ZWRITEENABLE                 */      =
STATE_RENDER(WINED3DRS_ZWRITEENABLE),               NULL                =
},=0A=
     { /* 15, WINED3DRS_ALPHATESTENABLE              */      =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            state_alpha         =
},=0A=
     { /* 16, WINED3DRS_LASTPIXEL                    */      =
STATE_RENDER(WINED3DRS_LASTPIXEL),                  state_lastpixel     =
},=0A=
     { /* 17, WINED3DRS_TEXTUREMAG                   */      0 /* =
Handled in ddraw */,                           state_undefined     },=0A=
@@ -4917,6 +4917,14 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
     { STATE_INDEXBUFFER,                                  { =
STATE_INDEXBUFFER,                                  indexbuffer         =
}},=0A=
     { STATE_RENDER(WINED3DRS_ANTIALIAS),                  { =
STATE_RENDER(WINED3DRS_ANTIALIAS),                  state_antialias     =
}},=0A=
     { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         { =
STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE),         state_perspective   =
}},=0A=
+    { STATE_RENDER(WINED3DRS_ZENABLE),                    { =
STATE_RENDER(WINED3DRS_ZENABLE),                    state_zenable       =
}},=0A=
+    { STATE_RENDER(WINED3DRS_FILLMODE),                   { =
STATE_RENDER(WINED3DRS_FILLMODE),                   state_fillmode      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_SHADEMODE),                  { =
STATE_RENDER(WINED3DRS_SHADEMODE),                  state_shademode     =
}},=0A=
+    { STATE_RENDER(WINED3DRS_LINEPATTERN),                { =
STATE_RENDER(WINED3DRS_LINEPATTERN),                state_linepattern   =
}},=0A=
+    { STATE_RENDER(WINED3DRS_MONOENABLE),                 { =
STATE_RENDER(WINED3DRS_MONOENABLE),                 state_monoenable    =
}},=0A=
+    { STATE_RENDER(WINED3DRS_ROP2),                       { =
STATE_RENDER(WINED3DRS_ROP2),                       state_rop2          =
}},=0A=
+    { STATE_RENDER(WINED3DRS_PLANEMASK),                  { =
STATE_RENDER(WINED3DRS_PLANEMASK),                  state_planemask     =
}},=0A=
+    { STATE_RENDER(WINED3DRS_ZWRITEENABLE),               { =
STATE_RENDER(WINED3DRS_ZWRITEENABLE),               state_zwritenable   =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0018_01C8E154.771CD5A0--




More information about the wine-patches mailing list