[WINED3D 1/3] SETP takes 3 parameters.
Ivan Gyurdiev
ivg2 at cornell.edu
Wed May 17 20:07:02 CDT 2006
Fix the number of parameters for setp (set predicate).
It takes 3 parameters - and the software shader is out of sync with the
table.
-------------- next part --------------
---
dlls/wined3d/pixelshader.c | 4 ++--
dlls/wined3d/vertexshader.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
e84c7e30a53770ad6f5373165f4582fd71221fe5
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index d391a8c..918de80 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -606,7 +606,7 @@ void pshader_texldd(WINED3DSHADERVECTOR*
FIXME(" : Stub\n");
}
-void pshader_setp(WINED3DSHADERVECTOR* d) {
+void pshader_setp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1) {
FIXME(" : Stub\n");
}
@@ -738,7 +738,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI
{D3DSIO_DSX, "dsx", GLNAME_REQUIRE_GLSL, 2, pshader_dsx, NULL, NULL, 0, 0},
{D3DSIO_DSY, "dsy", GLNAME_REQUIRE_GLSL, 2, pshader_dsy, NULL, NULL, 0, 0},
{D3DSIO_TEXLDD, "texldd", GLNAME_REQUIRE_GLSL, 2, pshader_texldd, NULL, NULL, 0, 0},
- {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 2, pshader_setp, NULL, NULL, 0, 0},
+ {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 3, pshader_setp, NULL, NULL, 0, 0},
{D3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 2, pshader_texldl, NULL, NULL, 0, 0},
{D3DSIO_PHASE, "phase", GLNAME_REQUIRE_GLSL, 0, pshader_nop, NULL, NULL, 0, 0},
{0, NULL, NULL, 0, NULL, NULL, 0, 0}
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 4321693..6dfbd11 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -469,7 +469,7 @@ void vshader_texldd(WINED3DSHADERVECTOR*
FIXME(" : Stub\n");
}
-void vshader_setp(WINED3DSHADERVECTOR* d) {
+void vshader_setp(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1) {
FIXME(" : Stub\n");
}
@@ -565,7 +565,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader
{D3DSIO_LABEL, "label", GLNAME_REQUIRE_GLSL, 1, vshader_label, NULL, NULL, 0, 0},
{D3DSIO_MOVA, "mova", GLNAME_REQUIRE_GLSL, 2, vshader_mova, NULL, NULL, 0, 0},
- {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 2, vshader_setp, NULL, NULL, 0, 0},
+ {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 3, vshader_setp, NULL, NULL, 0, 0},
{D3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 2, vshader_texldl, NULL, NULL, 0, 0},
{0, NULL, NULL, 0, NULL, NULL, 0, 0}
};
--
1.3.1
More information about the wine-patches
mailing list