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

[Stefan Doesinger]

=0A=
---=0A=
 dlls/wined3d/state.c |   18 ++++++++++++------=0A=
 1 files changed, 12 insertions(+), 6 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 2e90dba..d9cc694 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3844,18 +3844,18 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /* 19, WINED3DRS_SRCBLEND                     */      =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE),           NULL                =
},=0A=
     { /* 20, WINED3DRS_DESTBLEND                    */      =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE),           NULL                =
},=0A=
     { /* 21, WINED3DRS_TEXTUREMAPBLEND              */      0 /* =
Handled in ddraw */,                           state_undefined     },=0A=
-    { /* 22, WINED3DRS_CULLMODE                     */      =
STATE_RENDER(WINED3DRS_CULLMODE),                   state_cullmode      =
},=0A=
-    { /* 23, WINED3DRS_ZFUNC                        */      =
STATE_RENDER(WINED3DRS_ZFUNC),                      state_zfunc         =
},=0A=
+    { /* 22, WINED3DRS_CULLMODE                     */      =
STATE_RENDER(WINED3DRS_CULLMODE),                   NULL                =
},=0A=
+    { /* 23, WINED3DRS_ZFUNC                        */      =
STATE_RENDER(WINED3DRS_ZFUNC),                      NULL                =
},=0A=
     { /* 24, WINED3DRS_ALPHAREF                     */      =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            NULL                =
},=0A=
     { /* 25, WINED3DRS_ALPHAFUNC                    */      =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            NULL                =
},=0A=
-    { /* 26, WINED3DRS_DITHERENABLE                 */      =
STATE_RENDER(WINED3DRS_DITHERENABLE),               state_ditherenable  =
},=0A=
+    { /* 26, WINED3DRS_DITHERENABLE                 */      =
STATE_RENDER(WINED3DRS_DITHERENABLE),               NULL                =
},=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),             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=
-    { /* 33, WINED3DRS_STIPPLEDALPHA                */      =
STATE_RENDER(WINED3DRS_STIPPLEDALPHA),              state_stippledalpha =
},=0A=
+    { /* 31, WINED3DRS_SUBPIXEL                     */      =
STATE_RENDER(WINED3DRS_SUBPIXEL),                   NULL                =
},=0A=
+    { /* 32, WINED3DRS_SUBPIXELX                    */      =
STATE_RENDER(WINED3DRS_SUBPIXELX),                  NULL                =
},=0A=
+    { /* 33, WINED3DRS_STIPPLEDALPHA                */      =
STATE_RENDER(WINED3DRS_STIPPLEDALPHA),              NULL                =
},=0A=
     { /* 34, WINED3DRS_FOGCOLOR                     */      =
STATE_RENDER(WINED3DRS_FOGCOLOR),                   state_fogcolor      =
},=0A=
     { /* 35, WINED3DRS_FOGTABLEMODE                 */      =
STATE_RENDER(WINED3DRS_FOGENABLE),                  state_fog           =
},=0A=
     { /* 36, WINED3DRS_FOGSTART                     */      =
STATE_RENDER(WINED3DRS_FOGENABLE),                  state_fog           =
},=0A=
@@ -4932,6 +4932,12 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
     { STATE_RENDER(WINED3DRS_ALPHAFUNC),                  { =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            state_alpha         =
}},=0A=
     { STATE_RENDER(WINED3DRS_COLORKEYENABLE),             { =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE),            state_alpha         =
}},=0A=
     { STATE_RENDER(WINED3DRS_LASTPIXEL),                  { =
STATE_RENDER(WINED3DRS_LASTPIXEL),                  state_lastpixel     =
}},=0A=
+    { STATE_RENDER(WINED3DRS_CULLMODE),                   { =
STATE_RENDER(WINED3DRS_CULLMODE),                   state_cullmode      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_ZFUNC),                      { =
STATE_RENDER(WINED3DRS_ZFUNC),                      state_zfunc         =
}},=0A=
+    { STATE_RENDER(WINED3DRS_DITHERENABLE),               { =
STATE_RENDER(WINED3DRS_DITHERENABLE),               state_ditherenable  =
}},=0A=
+    { STATE_RENDER(WINED3DRS_SUBPIXEL),                   { =
STATE_RENDER(WINED3DRS_SUBPIXEL),                   state_subpixel      =
}},=0A=
+    { STATE_RENDER(WINED3DRS_SUBPIXELX),                  { =
STATE_RENDER(WINED3DRS_SUBPIXELX),                  state_subpixelx     =
}},=0A=
+    { STATE_RENDER(WINED3DRS_STIPPLEDALPHA),              { =
STATE_RENDER(WINED3DRS_STIPPLEDALPHA),              state_stippledalpha =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0008_01C8E154.67020FF0--