[PATCH] WineD3D: Move the last states=0A=

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 22:26:20 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   33 ++++++++++++++++++++++-----------=0A=
 1 files changed, 22 insertions(+), 11 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index d8dcaad..0a74e79 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3983,23 +3983,23 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /*158, WINED3DRS_POINTSCALE_A                 */      =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           NULL                =
},=0A=
     { /*159, WINED3DRS_POINTSCALE_B                 */      =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           NULL                =
},=0A=
     { /*160, WINED3DRS_POINTSCALE_C                 */      =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE),           NULL                =
},=0A=
-    { /*161, WINED3DRS_MULTISAMPLEANTIALIAS         */      =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS),       state_multisampleaa =
},=0A=
-    { /*162, WINED3DRS_MULTISAMPLEMASK              */      =
STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            state_multisampmask =
},=0A=
+    { /*161, WINED3DRS_MULTISAMPLEANTIALIAS         */      =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS),       NULL                =
},=0A=
+    { /*162, WINED3DRS_MULTISAMPLEMASK              */      =
STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            NULL                =
},=0A=
     { /*163, WINED3DRS_PATCHEDGESTYLE               */      =
STATE_RENDER(WINED3DRS_PATCHEDGESTYLE),             NULL                =
},=0A=
     { /*164, WINED3DRS_PATCHSEGMENTS                */      =
STATE_RENDER(WINED3DRS_PATCHSEGMENTS),              NULL                =
},=0A=
     { /*165, WINED3DRS_DEBUGMONITORTOKEN            */      =
STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN),          state_nogl          =
},=0A=
     { /*166, WINED3DRS_POINTSIZE_MAX                */      =
STATE_RENDER(WINED3DRS_POINTSIZE_MAX),              NULL                =
},=0A=
     { /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE     */      0,          =
                                        state_nogl          },=0A=
-    { /*168, WINED3DRS_COLORWRITEENABLE             */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
},=0A=
+    { /*168, WINED3DRS_COLORWRITEENABLE             */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           NULL                =
},=0A=
     { /*169, Undefined                              */      0,          =
                                        state_undefined     },=0A=
     { /*170, WINED3DRS_TWEENFACTOR                  */      0,          =
                                        state_nogl          },=0A=
-    { /*171, WINED3DRS_BLENDOP                      */      =
STATE_RENDER(WINED3DRS_BLENDOP),                    state_blendop       =
},=0A=
+    { /*171, WINED3DRS_BLENDOP                      */      =
STATE_RENDER(WINED3DRS_BLENDOP),                    NULL                =
},=0A=
     { /*172, WINED3DRS_POSITIONDEGREE               */      =
STATE_RENDER(WINED3DRS_POSITIONDEGREE),             NULL                =
},=0A=
     { /*173, WINED3DRS_NORMALDEGREE                 */      =
STATE_RENDER(WINED3DRS_NORMALDEGREE),               NULL                =
},=0A=
       /*172, WINED3DRS_POSITIONORDER                */      /* Value =
assigned to 2 state names */=0A=
       /*173, WINED3DRS_NORMALORDER                  */      /* Value =
assigned to 2 state names */=0A=
-    { /*174, WINED3DRS_SCISSORTESTENABLE            */      =
STATE_RENDER(WINED3DRS_SCISSORTESTENABLE),          state_scissor       =
},=0A=
-    { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS          */      =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  state_depthbias     =
},=0A=
+    { /*174, WINED3DRS_SCISSORTESTENABLE            */      =
STATE_RENDER(WINED3DRS_SCISSORTESTENABLE),          NULL                =
},=0A=
+    { /*175, WINED3DRS_SLOPESCALEDEPTHBIAS          */      =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  NULL                =
},=0A=
     { /*176, WINED3DRS_ANTIALIASEDLINEENABLE        */      =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE),           NULL                =
},=0A=
     { /*177, undefined                              */      0,          =
                                        state_undefined     },=0A=
     { /*178, WINED3DRS_MINTESSELLATIONLEVEL         */      =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL                =
},=0A=
@@ -4014,12 +4014,12 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /*187, WINED3DRS_CCW_STENCILZFAIL             */      =
STATE_RENDER(WINED3DRS_STENCILENABLE),              NULL                =
},=0A=
     { /*188, WINED3DRS_CCW_STENCILPASS              */      =
STATE_RENDER(WINED3DRS_STENCILENABLE),              NULL                =
},=0A=
     { /*189, WINED3DRS_CCW_STENCILFUNC              */      =
STATE_RENDER(WINED3DRS_STENCILENABLE),              NULL                =
},=0A=
-    { /*190, WINED3DRS_COLORWRITEENABLE1            */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
},=0A=
-    { /*191, WINED3DRS_COLORWRITEENABLE2            */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
},=0A=
-    { /*192, WINED3DRS_COLORWRITEENABLE3            */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
},=0A=
-    { /*193, WINED3DRS_BLENDFACTOR                  */      =
STATE_RENDER(WINED3DRS_BLENDFACTOR),                state_blendfactor   =
},=0A=
+    { /*190, WINED3DRS_COLORWRITEENABLE1            */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           NULL                =
},=0A=
+    { /*191, WINED3DRS_COLORWRITEENABLE2            */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           NULL                =
},=0A=
+    { /*192, WINED3DRS_COLORWRITEENABLE3            */      =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           NULL                =
},=0A=
+    { /*193, WINED3DRS_BLENDFACTOR                  */      =
STATE_RENDER(WINED3DRS_BLENDFACTOR),                NULL                =
},=0A=
     { /*194, WINED3DRS_SRGBWRITEENABLE              */      =
STATE_PIXELSHADER,                                  NULL                =
},=0A=
-    { /*195, WINED3DRS_DEPTHBIAS                    */      =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  state_depthbias     =
},=0A=
+    { /*195, WINED3DRS_DEPTHBIAS                    */      =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  NULL                =
},=0A=
     { /*196, undefined                              */      0,          =
                                        state_undefined     },=0A=
     { /*197, undefined                              */      0,          =
                                        state_undefined     },=0A=
     { /*198, WINED3DRS_WRAP8                        */      =
STATE_RENDER(WINED3DRS_WRAP0),                      NULL                =
},=0A=
@@ -4986,6 +4986,17 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
     { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z),             { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation  =
}},=0A=
     { STATE_RENDER(WINED3DRS_ADAPTIVETESS_W),             { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation  =
}},=0A=
     { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation  =
}},=0A=
+    { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS),       { =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS),       state_multisampleaa =
}},=0A=
+    { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            { =
STATE_RENDER(WINED3DRS_MULTISAMPLEMASK),            state_multisampmask =
}},=0A=
+    { STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           { =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
}},=0A=
+    { STATE_RENDER(WINED3DRS_BLENDOP),                    { =
STATE_RENDER(WINED3DRS_BLENDOP),                    state_blendop       =
}},=0A=
+    { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE),          { =
STATE_RENDER(WINED3DRS_SCISSORTESTENABLE),          state_scissor       =
}},=0A=
+    { STATE_RENDER(WINED3DRS_SLOPESCALEDEPTHBIAS),        { =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  state_depthbias     =
}},=0A=
+    { STATE_RENDER(WINED3DRS_COLORWRITEENABLE1),          { =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
}},=0A=
+    { STATE_RENDER(WINED3DRS_COLORWRITEENABLE2),          { =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
}},=0A=
+    { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3),          { =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
}},=0A=
+    { STATE_RENDER(WINED3DRS_BLENDFACTOR),                { =
STATE_RENDER(WINED3DRS_BLENDFACTOR),                state_blendfactor   =
}},=0A=
+    { STATE_RENDER(WINED3DRS_DEPTHBIAS),                  { =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  state_depthbias     =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0023_01C8E2A2.A3F0DD70--




More information about the wine-patches mailing list