Ivan Gyurdiev : wined3d: Fix params for DP2ADD/TEXLDD.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 45dbb78d733ef99c6acf57ef051aad581a424c28
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=45dbb78d733ef99c6acf57ef051aad581a424c28

Author: Ivan Gyurdiev <ivg231 at gmail.com>
Date:   Mon Jun 12 06:58:33 2006 -0400

wined3d: Fix params for DP2ADD/TEXLDD.

DP2ADD is valid on pshaders 2.0 and above, has 4 parameters.
TEXLDD is valid on pshaders 2.x and above, has 5 parameters.

---

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

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index d1b71f9..60bbfaf 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -590,7 +590,7 @@ static void pshader_defi(WINED3DSHADERVE
     FIXME(" : Stub\n");
 }
 
-static void pshader_dp2add(WINED3DSHADERVECTOR* d) {
+static void pshader_dp2add(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) {
     FIXME(" : Stub\n");
 }
 
@@ -602,7 +602,7 @@ static void pshader_dsy(WINED3DSHADERVEC
     FIXME(" : Stub\n");
 }
 
-static void pshader_texldd(WINED3DSHADERVECTOR* d) {
+static void pshader_texldd(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2, WINED3DSHADERVECTOR* s3) {
     FIXME(" : Stub\n");
 }
 
@@ -676,7 +676,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI
     {D3DSIO_SINCOS,   "sincos",   NULL, 1, 4, pshader_sincos2, NULL, NULL, D3DPS_VERSION(2,0), D3DPS_VERSION(2,0)},
     {D3DSIO_SINCOS,   "sincos",   NULL, 1, 2, pshader_sincos3, NULL, NULL, D3DPS_VERSION(3,0), -1},
     /* TODO: dp2add can be made out of multiple instuctions */
-    {D3DSIO_DP2ADD,   "dp2add",   GLNAME_REQUIRE_GLSL,  1, 2, pshader_dp2add,  NULL, NULL, 0, 0},
+    {D3DSIO_DP2ADD,   "dp2add",   GLNAME_REQUIRE_GLSL,  1, 4, pshader_dp2add,  NULL, NULL, D3DPS_VERSION(2,0), -1},
 
     /* Matrix */
     {D3DSIO_M4x4, "m4x4", "undefined", 1, 3, pshader_m4x4, NULL, shader_glsl_mnxn, 0, 0},
@@ -738,7 +738,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI
     /* TODO: dp2add can be made out of multiple instuctions */
     {D3DSIO_DSX,      "dsx",      GLNAME_REQUIRE_GLSL, 1, 2, pshader_dsx,     NULL, NULL, 0, 0},
     {D3DSIO_DSY,      "dsy",      GLNAME_REQUIRE_GLSL, 1, 2, pshader_dsy,     NULL, NULL, 0, 0},
-    {D3DSIO_TEXLDD,   "texldd",   GLNAME_REQUIRE_GLSL, 1, 2, pshader_texldd,  NULL, NULL, 0, 0},
+    {D3DSIO_TEXLDD,   "texldd",   GLNAME_REQUIRE_GLSL, 1, 5, pshader_texldd,  NULL, NULL, D3DPS_VERSION(2,1), -1},
     {D3DSIO_SETP,     "setp",     GLNAME_REQUIRE_GLSL, 1, 3, pshader_setp,    NULL, NULL, 0, 0},
     {D3DSIO_TEXLDL,   "texdl",    GLNAME_REQUIRE_GLSL, 1, 2, pshader_texldl,  NULL, NULL, 0, 0},
     {D3DSIO_PHASE,    "phase",    GLNAME_REQUIRE_GLSL, 0, 0, pshader_nop,     NULL, NULL, 0, 0},