Skip to content

W
wine-cw
Commit eb7b1f4b authored by Kovács András's avatar Kovács András Committed by Alexandre Julliard
Browse files
Options

wined3d: Fix introduced regression in shader_glsl_mnxn and vshader_hw_mnxn.

parent 74a09f90
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 10 deletions
dlls/wined3d/arb_program_shader.c
View file @ eb7b1f4b
...@@ -854,23 +854,23 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg) { ...@@ -854,23 +854,23 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg) {
switch(arg->opcode->opcode) { switch(arg->opcode->opcode) {
case WINED3DSIO_M4x4: case WINED3DSIO_M4x4:
nComponents = 4; nComponents = 4;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4);
break; break;
case WINED3DSIO_M4x3: case WINED3DSIO_M4x3:
nComponents = 3; nComponents = 3;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4);
break; break;
case WINED3DSIO_M3x4: case WINED3DSIO_M3x4:
nComponents = 4; nComponents = 4;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3);
break; break;
case WINED3DSIO_M3x3: case WINED3DSIO_M3x3:
nComponents = 3; nComponents = 3;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3);
break; break;
case WINED3DSIO_M3x2: case WINED3DSIO_M3x2:
nComponents = 2; nComponents = 2;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3);
break; break;
default: default:
break; break;
......
dlls/wined3d/glsl_shader.c
View file @ eb7b1f4b
...@@ -1140,23 +1140,23 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* arg) { ...@@ -1140,23 +1140,23 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* arg) {
switch(arg->opcode->opcode) { switch(arg->opcode->opcode) {
case WINED3DSIO_M4x4: case WINED3DSIO_M4x4:
nComponents = 4; nComponents = 4;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4);
break; break;
case WINED3DSIO_M4x3: case WINED3DSIO_M4x3:
nComponents = 3; nComponents = 3;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4);
break; break;
case WINED3DSIO_M3x4: case WINED3DSIO_M3x4:
nComponents = 4; nComponents = 4;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3);
break; break;
case WINED3DSIO_M3x3: case WINED3DSIO_M3x3:
nComponents = 3; nComponents = 3;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3);
break; break;
case WINED3DSIO_M3x2: case WINED3DSIO_M3x2:
nComponents = 2; nComponents = 2;
tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3);
break; break;
default: default:
break; break;
......
dlls/wined3d/vertexshader.c
View file @ eb7b1f4b
...@@ -473,6 +473,7 @@ static void vshader_texldl(WINED3DSHADERVECTOR* d) { ...@@ -473,6 +473,7 @@ static void vshader_texldl(WINED3DSHADERVECTOR* d) {
} }
CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = {
/* This table is not order or position dependent. */
/* Arithmetic */ /* Arithmetic */
{WINED3DSIO_NOP, "nop", "NOP", 0, 0, vshader_nop, vshader_hw_map2gl, NULL, 0, 0}, {WINED3DSIO_NOP, "nop", "NOP", 0, 0, vshader_nop, vshader_hw_map2gl, 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