From f68ac7465ff89ec6144ba529e452113877d7f6fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20D=C3=B6singer?= Date: Wed, 2 Jul 2008 15:47:18 -0500 Subject: [PATCH] wined3d: Move pixelshader application to the fragment pipeline. --- dlls/wined3d/state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 41c5828546..1f47e28167 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4321,7 +4321,7 @@ const struct StateEntry FFPStateTable[] = { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), sampler }, { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), sampler }, /* Pixel shader */ - { /* , Pixel Shader */ STATE_PIXELSHADER, pixelshader }, + { /* , Pixel Shader */ STATE_PIXELSHADER, NULL }, /* Transform states follow */ { /* 1, undefined */ 0, state_undefined }, { /* 2, WINED3DTS_VIEW */ STATE_TRANSFORM(WINED3DTS_VIEW), NULL }, @@ -5383,6 +5383,7 @@ const struct StateEntryTemplate ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAARG0), { STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop }}, { STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), { STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }}, { STATE_TEXTURESTAGE(7, WINED3DTSS_CONSTANT), { 0 /* As long as we don't support D3DTA_CONSTANT */, state_nogl }}, + { STATE_PIXELSHADER, { STATE_PIXELSHADER, pixelshader }}, {0 /* Terminate */, { 0, 0 }}, }; -- 2.32.0.93.g670b81a890