[WINED3D 1/5] pshader defi has 5 parameters.

Ivan Gyurdiev ivg2 at cornell.edu
Tue Jun 6 01:37:40 CDT 2006


I previously changed vshader defi to have 5 params.
Didn't touch pshaders, since MSDN claimed otherwise.
Testing shows MSDN is wrong - looks like copy/paste docs from defb.

-------------- next part --------------
---

 dlls/wined3d/pixelshader.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

2cf782ec412289bf8cd8661676453542821af262
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 283d1f0..a1b1d49 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -586,7 +586,7 @@ void pshader_defb(WINED3DSHADERVECTOR* d
     FIXME(" : Stub\n");
 }
 
-void pshader_defi(WINED3DSHADERVECTOR* d) {
+void pshader_defi(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) {
     FIXME(" : Stub\n");
 }
 
@@ -707,7 +707,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI
     /* Constant definitions */
     {D3DSIO_DEF,      "def",      "undefined",           5, pshader_def,     pshader_hw_def, NULL, 0, 0},
     {D3DSIO_DEFB,     "defb",     GLNAME_REQUIRE_GLSL,   2, pshader_defb,    NULL, NULL, 0, 0},
-    {D3DSIO_DEFI,     "defi",     GLNAME_REQUIRE_GLSL,   2, pshader_defi,    NULL, NULL, 0, 0},
+    {D3DSIO_DEFI,     "defi",     GLNAME_REQUIRE_GLSL,   5, pshader_defi,    NULL, NULL, 0, 0},
 
     /* Texture */
     {D3DSIO_TEXCOORD, "texcoord", "undefined",   1, pshader_texcoord,    pshader_hw_texcoord, NULL, 0, D3DPS_VERSION(1,3)},
-- 
1.3.3



More information about the wine-patches mailing list