Module: wine Branch: master Commit: beed89cde404e3a1dedadf53d06c78c51f39fd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=beed89cde404e3a1dedadf53d0...
Author: H. Verbeet hverbeet@gmail.com Date: Thu Jan 18 23:42:00 2007 +0100
wined3d: The sincos instruction is valid for ps/vs 2.1 as well.
---
dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 8573b9b..8958ee0 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -658,7 +658,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI
*/ {WINED3DSIO_NRM, "nrm", NULL, 1, 2, pshader_nrm, NULL, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, pshader_sincos2, NULL, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,0)}, + {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, pshader_sincos2, NULL, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, pshader_sincos3, NULL, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, /* TODO: dp2add can be made out of multiple instuctions */ {WINED3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 1, 4, pshader_dp2add, NULL, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index c6e034d..961f4f9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -517,7 +517,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader
*/ {WINED3DSIO_NRM, "nrm", NULL, 1, 2, vshader_nrm, NULL, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, vshader_sincos2, NULL, shader_glsl_sincos, WINED3DVS_VERSION(2,0), WINED3DVS_VERSION(2,0)}, + {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, vshader_sincos2, NULL, shader_glsl_sincos, WINED3DVS_VERSION(2,0), WINED3DVS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, vshader_sincos3, NULL, shader_glsl_sincos, WINED3DVS_VERSION(3,0), -1},
/* Matrix */