Skip to content

W
wine-winehq
Commit c94ecdff authored by Ivan Gyurdiev's avatar Ivan Gyurdiev Committed by Alexandre Julliard
Browse files
Options

wined3d: Fix SINCOS parameters.

SINCOS has 4 parameters in shaders 2.0. It has 2 parameters in shaders 3.0. It's undefined in shaders 1.0.
parent 6b5d0763
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
dlls/wined3d/pixelshader.c
View file @ c94ecdff
...@@ -533,7 +533,11 @@ void pshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { ...@@ -533,7 +533,11 @@ void pshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
FIXME(" : Stub\n"); FIXME(" : Stub\n");
} }
void pshader_sincos(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { void pshader_sincos3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
FIXME(" : Stub\n");
}
void pshader_sincos2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) {
FIXME(" : Stub\n"); FIXME(" : Stub\n");
} }
...@@ -667,7 +671,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { ...@@ -667,7 +671,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = {
*/ */
{D3DSIO_NRM, "nrm", NULL, 2, pshader_nrm, NULL, NULL, 0, 0}, {D3DSIO_NRM, "nrm", NULL, 2, pshader_nrm, NULL, NULL, 0, 0},
{D3DSIO_SINCOS, "sincos", NULL, 2, pshader_sincos, NULL, NULL, 0, 0}, {D3DSIO_SINCOS, "sincos", NULL, 4, pshader_sincos2, NULL, NULL, D3DPS_VERSION(2,0), D3DPS_VERSION(2,0)},
{D3DSIO_SINCOS, "sincos", NULL, 2, pshader_sincos3, NULL, NULL, D3DPS_VERSION(3,0), -1},
/* TODO: dp2add can be made out of multiple instuctions */ /* TODO: dp2add can be made out of multiple instuctions */
{D3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 2, pshader_dp2add, NULL, NULL, 0, 0}, {D3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 2, pshader_dp2add, NULL, NULL, 0, 0},
......
dlls/wined3d/vertexshader.c
View file @ c94ecdff
...@@ -404,7 +404,11 @@ void vshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { ...@@ -404,7 +404,11 @@ void vshader_nrm(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
FIXME(" : Stub\n"); FIXME(" : Stub\n");
} }
void vshader_sincos(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) { void vshader_sincos3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0) {
FIXME(" : Stub\n");
}
void vshader_sincos2(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, WINED3DSHADERVECTOR* s1, WINED3DSHADERVECTOR* s2) {
FIXME(" : Stub\n"); FIXME(" : Stub\n");
} }
...@@ -524,7 +528,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { ...@@ -524,7 +528,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = {
*/ */
{D3DSIO_NRM, "nrm", NULL, 2, vshader_nrm, NULL, NULL, 0, 0}, {D3DSIO_NRM, "nrm", NULL, 2, vshader_nrm, NULL, NULL, 0, 0},
{D3DSIO_SINCOS, "sincos", NULL, 2, vshader_sincos, NULL, NULL, 0, 0}, {D3DSIO_SINCOS, "sincos", NULL, 4, vshader_sincos2, NULL, NULL, D3DVS_VERSION(2,0), D3DVS_VERSION(2,0)},
{D3DSIO_SINCOS, "sincos", NULL, 2, vshader_sincos3, NULL, NULL, D3DVS_VERSION(3,0), -1},
/* Matrix */ /* Matrix */
{D3DSIO_M4x4, "m4x4", "undefined", 3, vshader_m4x4, vshader_hw_mnxn, NULL, 0, 0}, {D3DSIO_M4x4, "m4x4", "undefined", 3, vshader_m4x4, vshader_hw_mnxn, NULL, 0, 0},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment