H. Verbeet : wined3d: Pass the correct number of parameters for texld with ps version >= 2.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Mar 29 06:21:05 CST 2006


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

Author: H. Verbeet <hverbeet at gmail.com>
Date:   Tue Mar 28 21:10:22 2006 +0200

wined3d: Pass the correct number of parameters for texld with ps version >= 2.

---

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

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index e5311c7..381a828 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -715,6 +715,7 @@ static CONST SHADER_OPCODE pshader_ins [
     {D3DSIO_TEXKILL,  "texkill",  "KIL",   1, pshader_texkill,     D3DPS_VERSION(1,0), D3DPS_VERSION(1,4)},
     {D3DSIO_TEX,      "tex",      "undefined",   1, pshader_tex,         0, D3DPS_VERSION(1,3)},
     {D3DSIO_TEX,      "texld",    GLNAME_REQUIRE_GLSL,   2, pshader_texld,       D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)},
+    {D3DSIO_TEX,      "texld",    GLNAME_REQUIRE_GLSL,   3, pshader_texld,       D3DPS_VERSION(2,0), -1},
     {D3DSIO_TEXBEM,   "texbem",   "undefined",   2, pshader_texbem,      0, D3DPS_VERSION(1,3)},
     {D3DSIO_TEXBEML,  "texbeml",  GLNAME_REQUIRE_GLSL,   2, pshader_texbeml,     D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)},
     {D3DSIO_TEXREG2AR,"texreg2ar","undefined",   2, pshader_texreg2ar,   D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},




More information about the wine-cvs mailing list