Stefan Dösinger : wined3d: Move pixelshader application to the fragment pipeline.
Alexandre Julliard
julliard at winehq.org
Wed Jul 9 06:10:08 CDT 2008
Module: wine
Branch: master
Commit: f68ac7465ff89ec6144ba529e452113877d7f6fd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68ac7465ff89ec6144ba529e452113877d7f6fd
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Jul 2 15:47:18 2008 -0500
wined3d: Move pixelshader application to the fragment pipeline.
---
dlls/wined3d/state.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 41c5828..1f47e28 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 }},
};
More information about the wine-cvs
mailing list