[PATCH] WineD3D: Move pixelshader application to the fragment =

Stefan Doesinger stefan at codeweavers.com
Wed Jul 2 15:47:18 CDT 2008


pipeline=0A=
=0A=
---=0A=
 dlls/wined3d/state.c |    3 ++-=0A=
 1 files changed, 2 insertions(+), 1 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 9334d25..37b12c7 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -4320,7 +4320,7 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /*18, Vertex sampler 2                        */      =
STATE_SAMPLER(18),                                  sampler             =
},=0A=
     { /*19, Vertex sampler 3                        */      =
STATE_SAMPLER(19),                                  sampler             =
},=0A=
     /* Pixel shader */=0A=
-    { /*  , Pixel Shader                            */      =
STATE_PIXELSHADER,                                  pixelshader         =
},=0A=
+    { /*  , Pixel Shader                            */      =
STATE_PIXELSHADER,                                  NULL                =
},=0A=
       /* Transform states follow                    */=0A=
     { /*  1, undefined                              */      0,          =
                                        state_undefined     },=0A=
     { /*  2, WINED3DTS_VIEW                         */      =
STATE_TRANSFORM(WINED3DTS_VIEW),                    NULL                =
},=0A=
@@ -5382,6 +5382,7 @@ const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAARG0),        { =
STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP),          tex_alphaop         =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG),        { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP),          tex_colorop         =
}},=0A=
     { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT),         { 0 /* As =
long as we don't support D3DTA_CONSTANT */, state_nogl          }},=0A=
+    { STATE_PIXELSHADER,                                  { =
STATE_PIXELSHADER,                                  pixelshader         =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0024_01C8E154.82FFE510--




More information about the wine-patches mailing list