January 2007 - Wine-commits

H. Verbeet : wined3d: Rewrite pshader_glsl_dp2add() to properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 9425aef623572771b8469a895329a60453126c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9425aef623572771b8469a895… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:20 2007 +0100 wined3d: Rewrite pshader_glsl_dp2add() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 348fc77..60f74c0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1817,19 +1817,20 @@ void pshader_glsl_texkill(SHADER_OPCODE_ /** Process the WINED3DSIO_DP2ADD instruction in GLSL. * dst = dot2(src0, src1) + src2 */ void pshader_glsl_dp2add(SHADER_OPCODE_ARG* arg) { + char src0_str[100], src1_str[100], src2_str[100]; + char src0_reg[50], src1_reg[50], src2_reg[50]; + char src0_mask[6], src1_mask[6], src2_mask[6]; + DWORD write_mask; + size_t mask_size; - char tmpLine[256]; - char dst_str[100], src0_str[100], src1_str[100], src2_str[100]; - char dst_reg[50], src0_reg[50], src1_reg[50], src2_reg[50]; - char dst_mask[6], src0_mask[6], src1_mask[6], src2_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); - shader_glsl_add_src_param_old(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%sdot(vec2(%s), vec2(%s)) + %s)%s;\n", - tmpLine, src0_str, src1_str, src2_str, dst_mask); + write_mask = shader_glsl_append_dst(arg->buffer, arg); + mask_size = shader_glsl_get_write_mask_size(write_mask); + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, src1_reg, src1_mask, src1_str); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], WINED3DSP_WRITEMASK_0, src2_reg, src2_mask, src2_str); + + shader_addline(arg->buffer, "dot(%s, %s) + %s);\n", src0_str, src1_str, src2_str); } void pshader_glsl_input_pack(

1 0

H. Verbeet : wined3d: Rewrite shader_glsl_mov() to properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: cb5c47f8fe2be14b0809f5f76778ad47b8ad05ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5c47f8fe2be14b0809f5f76… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:27 2007 +0100 wined3d: Rewrite shader_glsl_mov() to properly take the write mask into account. In case of writing to an address register round the source. --- dlls/wined3d/glsl_shader.c | 33 ++++++++++++++++++++++++--------- 1 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 60f74c0..6579e6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -963,17 +963,32 @@ void shader_glsl_arith(SHADER_OPCODE_ARG /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ void shader_glsl_mov(SHADER_OPCODE_ARG* arg) { - + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; SHADER_BUFFER* buffer = arg->buffer; - char tmpLine[256]; - char dst_str[100], src0_str[100]; - char dst_reg[50], src0_reg[50]; - char dst_mask[6], src0_mask[6]; + char src0_str[100]; + char src0_reg[50]; + char src0_mask[6]; + DWORD write_mask; - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(buffer, "%s%s)%s;\n", tmpLine, src0_str, dst_mask); + write_mask = shader_glsl_append_dst(buffer, arg); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, src0_reg, src0_mask, src0_str); + + /* In vs_1_1 WINED3DSIO_MOV can write to the adress register. In later + * shader versions WINED3DSIO_MOVA is used for this. */ + if ((WINED3DSHADER_VERSION_MAJOR(shader->baseShader.hex_version) == 1 && + !shader_is_pshader_version(shader->baseShader.hex_version) && + shader_get_regtype(arg->dst) == WINED3DSPR_ADDR) || + arg->opcode->opcode == WINED3DSIO_MOVA) { + /* We need to *round* to the nearest int here. */ + size_t mask_size = shader_glsl_get_write_mask_size(write_mask); + if (mask_size > 1) { + shader_addline(buffer, "ivec%d(floor(%s + vec%d(0.5))));\n", mask_size, src0_str, mask_size); + } else { + shader_addline(buffer, "int(floor(%s + 0.5)));\n", src0_str); + } + } else { + shader_addline(buffer, "%s);\n", src0_str); + } } /* Process the dot product operators DP3 and DP4 in GLSL (dst = dot(src0, src1)) */

1 0

H. Verbeet : wined3d: Move WINED3DSIO_SGE & WINED3DSIO_SLT from shader_glsl_map2gl() to shader_glsl_compare() where they belong.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: b557a8021a0ffe83b9ea5605f363f24915c62796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b557a8021a0ffe83b9ea5605f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:31:49 2007 +0100 wined3d: Move WINED3DSIO_SGE & WINED3DSIO_SLT from shader_glsl_map2gl() to shader_glsl_compare() where they belong. Properly take the write mask into account --- dlls/wined3d/glsl_shader.c | 60 +++++++++++++++++++++++++++---------------- 1 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a020da..6523d35 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -749,6 +749,17 @@ static DWORD shader_glsl_get_write_mask( return mask; } +static size_t shader_glsl_get_write_mask_size(DWORD write_mask) { + size_t size = 0; + + if (write_mask & WINED3DSP_WRITEMASK_0) ++size; + if (write_mask & WINED3DSP_WRITEMASK_1) ++size; + if (write_mask & WINED3DSP_WRITEMASK_2) ++size; + if (write_mask & WINED3DSP_WRITEMASK_3) ++size; + + return size; +} + static void shader_glsl_get_swizzle(const DWORD param, BOOL fixup, DWORD mask, char *swizzle_str) { /* For registers of type WINED3DDECLTYPE_D3DCOLOR, data is stored as "bgra", * but addressed as "rgba". To fix this we need to swap the register's x @@ -1021,8 +1032,6 @@ void shader_glsl_map2gl(SHADER_OPCODE_AR case WINED3DSIO_LOGP: case WINED3DSIO_LOG: strcat(tmpLine, "log2"); break; case WINED3DSIO_EXP: strcat(tmpLine, "exp2"); break; - case WINED3DSIO_SGE: strcat(tmpLine, "greaterThanEqual"); break; - case WINED3DSIO_SLT: strcat(tmpLine, "lessThan"); break; case WINED3DSIO_SGN: strcat(tmpLine, "sign"); break; default: FIXME("Opcode %s not yet handled in GLSL\n", curOpcode->name); @@ -1097,32 +1106,39 @@ void shader_glsl_rcp(SHADER_OPCODE_ARG* /** Process signed comparison opcodes in GLSL. */ void shader_glsl_compare(SHADER_OPCODE_ARG* arg) { + char src0_str[100], src1_str[100]; + char src0_reg[50], src1_reg[50]; + char src0_mask[6], src1_mask[6]; + DWORD write_mask; + size_t mask_size; - char tmpLine[256]; - char dst_str[100], src0_str[100], src1_str[100]; - char dst_reg[50], src0_reg[50], src1_reg[50]; - char dst_mask[6], src0_mask[6], src1_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); + write_mask = shader_glsl_append_dst(arg->buffer, arg); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, src1_reg, src1_mask, src1_str); - /* If we are comparing vectors and not scalars, we should process this through map2gl using the GLSL functions. */ - if (strlen(src0_mask) != 2) { - shader_glsl_map2gl(arg); + if (mask_size > 1) { + const char *compare; + + switch(arg->opcode->opcode) { + case WINED3DSIO_SLT: compare = "lessThan"; break; + case WINED3DSIO_SGE: compare = "greaterThanEqual"; break; + default: compare = ""; + FIXME("Can't handle opcode %s\n", arg->opcode->name); + } + + shader_addline(arg->buffer, "vec%d(%s(%s, %s)));\n", mask_size, compare, src0_str, src1_str); } else { - char compareStr[3]; - compareStr[0] = 0; - shader_glsl_add_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); + const char *compare; - switch (arg->opcode->opcode) { - case WINED3DSIO_SLT: strcpy(compareStr, "<"); break; - case WINED3DSIO_SGE: strcpy(compareStr, ">="); break; - default: + switch(arg->opcode->opcode) { + case WINED3DSIO_SLT: compare = "<"; break; + case WINED3DSIO_SGE: compare = ">="; break; + default: compare = ""; FIXME("Can't handle opcode %s\n", arg->opcode->name); } - shader_addline(arg->buffer, "%s(float(%s) %s float(%s)) ? 1.0 : 0.0)%s;\n", - tmpLine, src0_str, compareStr, src1_str, dst_mask); + + shader_addline(arg->buffer, "(%s %s %s) ? 1.0 : 0.0);\n", src0_str, compare, src1_str); } }

1 0

H. Verbeet : wined3d: Give WINED3DSIO_CRS its own function, properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 7252b4d340a41daa2d10ad2df3908b70417a849f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7252b4d340a41daa2d10ad2df… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:31:56 2007 +0100 wined3d: Give WINED3DSIO_CRS its own function, properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 16 +++++++++++++++- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/vertexshader.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6523d35..ca5ae44 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1003,6 +1003,21 @@ void shader_glsl_dot(SHADER_OPCODE_ARG* tmpDest, cast, src0_str, cast, src1_str, dst_mask); } +/* Note that this instruction has some restrictions. The destination write mask + * can't contain the w component, and the source swizzles have to be .xyzw */ +void shader_glsl_cross(SHADER_OPCODE_ARG *arg) { + char src0_reg[50], src0_mask[6], src0_str[100]; + char src1_reg[50], src1_mask[6], src1_str[100]; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + char dst_mask[6]; + + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src_mask, src1_reg, src1_mask, src1_str); + shader_addline(arg->buffer, "cross(%s, %s).%s);\n", src0_str, src1_str, dst_mask); +} + /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { @@ -1027,7 +1042,6 @@ void shader_glsl_map2gl(SHADER_OPCODE_AR case WINED3DSIO_ABS: strcat(tmpLine, "abs"); break; case WINED3DSIO_FRC: strcat(tmpLine, "fract"); break; case WINED3DSIO_POW: strcat(tmpLine, "pow"); break; - case WINED3DSIO_CRS: strcat(tmpLine, "cross"); break; case WINED3DSIO_NRM: strcat(tmpLine, "normalize"); break; case WINED3DSIO_LOGP: case WINED3DSIO_LOG: strcat(tmpLine, "log2"); break; diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index ce69e0b..8573b9b 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -646,7 +646,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderI {WINED3DSIO_CND, "cnd", NULL, 1, 4, pshader_cnd, pshader_hw_cnd, shader_glsl_cnd, WINED3DPS_VERSION(1,1), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_CMP, "cmp", NULL, 1, 4, pshader_cmp, pshader_hw_cmp, shader_glsl_cmp, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(3,0)}, {WINED3DSIO_POW, "pow", "POW", 1, 3, pshader_pow, NULL, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_CRS, "crs", "XPS", 1, 3, pshader_crs, NULL, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_CRS, "crs", "XPS", 1, 3, pshader_crs, NULL, shader_glsl_cross, 0, 0}, /* TODO: xyz normalise can be performed as VS_ARB using one temporary register, DP3 tmp , vec, vec; RSQ tmp, tmp.x; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index cd2d472..c6e034d 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -501,7 +501,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader {WINED3DSIO_LRP, "lrp", "LRP", 1, 4, vshader_lrp, NULL, shader_glsl_lrp, 0, 0}, {WINED3DSIO_FRC, "frc", "FRC", 1, 2, vshader_frc, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_POW, "pow", "POW", 1, 3, vshader_pow, NULL, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_CRS, "crs", "XPS", 1, 3, vshader_crs, NULL, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_CRS, "crs", "XPS", 1, 3, vshader_crs, NULL, shader_glsl_cross, 0, 0}, /* TODO: sng can possibly be performed a s RCP tmp, vec MUL out, tmp, vec*/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ff6b26..6b4c42a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1616,6 +1616,7 @@ extern void shader_glsl_load_constants( char useVertexShader); /** The following translate DirectX pixel/vertex shader opcodes to GLSL lines */ +extern void shader_glsl_cross(SHADER_OPCODE_ARG* arg); extern void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg); extern void shader_glsl_arith(SHADER_OPCODE_ARG* arg); extern void shader_glsl_mov(SHADER_OPCODE_ARG* arg);

1 0

H. Verbeet : wined3d: Rewrite shader_glsl_map2gl() to properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: b3ff0c3703bdd956bd87cedf2c2eb9a5b04f4be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ff0c3703bdd956bd87cedf2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:07 2007 +0100 wined3d: Rewrite shader_glsl_map2gl() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 57 ++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ca5ae44..6008651 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1020,54 +1020,49 @@ void shader_glsl_cross(SHADER_OPCODE_ARG /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg) { - CONST SHADER_OPCODE* curOpcode = arg->opcode; SHADER_BUFFER* buffer = arg->buffer; - char tmpLine[256]; - char dst_str[100], src_str[100]; - char dst_reg[50], src_reg[50]; - char dst_mask[6], src_mask[6]; + const char *instruction; + char arguments[256]; + char src_str[100]; + char src_reg[50]; + char src_mask[6]; + DWORD write_mask; unsigned i; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - /* Determine the GLSL function to use based on the opcode */ /* TODO: Possibly make this a table for faster lookups */ switch (curOpcode->opcode) { - case WINED3DSIO_MIN: strcat(tmpLine, "min"); break; - case WINED3DSIO_MAX: strcat(tmpLine, "max"); break; - case WINED3DSIO_RSQ: strcat(tmpLine, "inversesqrt"); break; - case WINED3DSIO_ABS: strcat(tmpLine, "abs"); break; - case WINED3DSIO_FRC: strcat(tmpLine, "fract"); break; - case WINED3DSIO_POW: strcat(tmpLine, "pow"); break; - case WINED3DSIO_NRM: strcat(tmpLine, "normalize"); break; - case WINED3DSIO_LOGP: - case WINED3DSIO_LOG: strcat(tmpLine, "log2"); break; - case WINED3DSIO_EXP: strcat(tmpLine, "exp2"); break; - case WINED3DSIO_SGN: strcat(tmpLine, "sign"); break; - default: + case WINED3DSIO_MIN: instruction = "min"; break; + case WINED3DSIO_MAX: instruction = "max"; break; + case WINED3DSIO_RSQ: instruction = "inversesqrt"; break; + case WINED3DSIO_ABS: instruction = "abs"; break; + case WINED3DSIO_FRC: instruction = "fract"; break; + case WINED3DSIO_POW: instruction = "pow"; break; + case WINED3DSIO_NRM: instruction = "normalize"; break; + case WINED3DSIO_LOGP: + case WINED3DSIO_LOG: instruction = "log2"; break; + case WINED3DSIO_EXP: instruction = "exp2"; break; + case WINED3DSIO_SGN: instruction = "sign"; break; + default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL\n", curOpcode->name); break; } - strcat(tmpLine, "("); + write_mask = shader_glsl_append_dst(buffer, arg); + arguments[0] = '\0'; if (curOpcode->num_params > 0) { - strcat(tmpLine, "vec4("); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src_reg, src_mask, src_str); - strcat(tmpLine, src_str); - strcat(tmpLine, ")"); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, src_reg, src_mask, src_str); + strcat(arguments, src_str); for (i = 2; i < curOpcode->num_params; ++i) { - strcat(tmpLine, ", vec4("); - shader_glsl_add_src_param_old(arg, arg->src[i-1], arg->src_addr[i-1], src_reg, src_mask, src_str); - strcat(tmpLine, src_str); - strcat(tmpLine, ")"); + strcat(arguments, ", "); + shader_glsl_add_src_param(arg, arg->src[i-1], arg->src_addr[i-1], write_mask, src_reg, src_mask, src_str); + strcat(arguments, src_str); } } - shader_addline(buffer, "%s))%s;\n", tmpLine, dst_mask); + shader_addline(buffer, "%s(%s));\n", instruction, arguments); } /** Process the WINED3DSIO_EXPP instruction in GLSL:

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_get_register_name().
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: dc0d2a27f1346b5df74d745242ea0267194f0a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0d2a27f1346b5df74d74524… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:31:17 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6690811..8ff8942 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -649,7 +649,7 @@ static void shader_glsl_get_register_nam * prior to that, it was hard-coded as "A0.x" because there's only 1 register */ if (WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2) { char relStr[100], relReg[50], relMask[6]; - shader_glsl_add_src_param_old(arg, addr_token, 0, relReg, relMask, relStr); + shader_glsl_add_src_param(arg, addr_token, 0, WINED3DSP_WRITEMASK_0, relReg, relMask, relStr); sprintf(tmpStr, "%s[%s + %u]", prefix, relStr, reg); } else sprintf(tmpStr, "%s[A0.x + %u]", prefix, reg);

1 0

H. Verbeet : wined3d: Rewrite shader_glsl_sincos() to properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 4452120007446a84270b63650fec8fdd678e58c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4452120007446a84270b63650… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:31:25 2007 +0100 wined3d: Rewrite shader_glsl_sincos() to properly take the write mask into account. The write mask can only be one of .x, .y, .xy --- dlls/wined3d/glsl_shader.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8ff8942..0afdb6c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -821,7 +821,6 @@ static DWORD shader_glsl_add_dst_param(S return mask; } -#if 0 /* Append the destination part of the instruction to the buffer, return the effective write mask */ static DWORD shader_glsl_append_dst(SHADER_BUFFER *buffer, SHADER_OPCODE_ARG *arg) { char reg_name[50], write_mask[6], reg_str[100]; @@ -834,7 +833,6 @@ static DWORD shader_glsl_append_dst(SHAD return mask; } -#endif /** Process GLSL instruction modifiers */ void shader_glsl_add_instruction_modifiers(SHADER_OPCODE_ARG* arg) { @@ -1306,16 +1304,31 @@ void shader_glsl_dst(SHADER_OPCODE_ARG* * dst.w = dst.w */ void shader_glsl_sincos(SHADER_OPCODE_ARG* arg) { - - char dst_str[100], src0_str[100]; - char dst_reg[50], src0_reg[50]; - char dst_mask[6], src0_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); + char src0_str[100]; + char src0_reg[50]; + char src0_mask[6]; + DWORD write_mask; - shader_addline(arg->buffer, "%s = vec4(cos(%s), sin(%s), %s.z, %s.w)%s;\n", - dst_str, src0_str, src0_str, dst_reg, dst_reg, dst_mask); + write_mask = shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src0_reg, src0_mask, src0_str); + + switch (write_mask) { + case WINED3DSP_WRITEMASK_0: + shader_addline(arg->buffer, "cos(%s));\n", src0_str); + break; + + case WINED3DSP_WRITEMASK_1: + shader_addline(arg->buffer, "sin(%s));\n", src0_str); + break; + + case (WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1): + shader_addline(arg->buffer, "vec2(cos(%s), sin(%s)));\n", src0_str, src0_str); + break; + + default: + ERR("Write mask should be .x, .y or .xy\n"); + break; + } } /** Process the WINED3DSIO_LOOP instruction in GLSL:

1 0

H. Verbeet : wined3d: Rewrite shader_glsl_arith() to properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: b0fd23e84400a8a950ca593ea80513aa10f0a01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fd23e84400a8a950ca593ea… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:31:31 2007 +0100 wined3d: Rewrite shader_glsl_arith() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0afdb6c..441b7f6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -925,32 +925,29 @@ static void shader_glsl_sample(SHADER_OP /* Generate GLSL arithmetic functions (dst = src1 + src2) */ void shader_glsl_arith(SHADER_OPCODE_ARG* arg) { - CONST SHADER_OPCODE* curOpcode = arg->opcode; SHADER_BUFFER* buffer = arg->buffer; - char tmpLine[256]; - char dst_reg[50], src0_reg[50], src1_reg[50]; - char dst_mask[6], src0_mask[6], src1_mask[6]; - char dst_str[100], src0_str[100], src1_str[100]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - strcat(tmpLine, "vec4("); - strcat(tmpLine, src0_str); - strcat(tmpLine, ")"); + char src0_reg[50], src1_reg[50]; + char src0_mask[6], src1_mask[6]; + char src0_str[100], src1_str[100]; + DWORD write_mask; + char op; /* Determine the GLSL operator to use based on the opcode */ switch (curOpcode->opcode) { - case WINED3DSIO_MUL: strcat(tmpLine, " * "); break; - case WINED3DSIO_ADD: strcat(tmpLine, " + "); break; - case WINED3DSIO_SUB: strcat(tmpLine, " - "); break; + case WINED3DSIO_MUL: op = '*'; break; + case WINED3DSIO_ADD: op = '+'; break; + case WINED3DSIO_SUB: op = '-'; break; default: + op = ' '; FIXME("Opcode %s not yet handled in GLSL\n", curOpcode->name); break; } - shader_addline(buffer, "%svec4(%s))%s;\n", tmpLine, src1_str, dst_mask); + + write_mask = shader_glsl_append_dst(buffer, arg); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, src1_reg, src1_mask, src1_str); + shader_addline(buffer, "%s %c %s);\n", src0_str, op, src1_str); } /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */

1 0

H. Verbeet : wined3d: Rewrite shader_glsl_mad() to properly take the write mask into account.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: e0f0bf1d08bbaab5d848f522fe1e0d9301cd1e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f0bf1d08bbaab5d848f522f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:31:37 2007 +0100 wined3d: Rewrite shader_glsl_mad() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 441b7f6..4a020da 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1163,20 +1163,16 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* /** GLSL code generation for WINED3DSIO_MAD: Multiply the first 2 opcodes, then add the last */ void shader_glsl_mad(SHADER_OPCODE_ARG* arg) { + char src0_str[100], src1_str[100], src2_str[100]; + char src0_reg[50], src1_reg[50], src2_reg[50]; + char src0_mask[6], src1_mask[6], src2_mask[6]; + DWORD write_mask; - char tmpLine[256]; - char dst_str[100], src0_str[100], src1_str[100], src2_str[100]; - char dst_reg[50], src0_reg[50], src1_reg[50], src2_reg[50]; - char dst_mask[6], src0_mask[6], src1_mask[6], src2_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_reg, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_glsl_add_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); - shader_glsl_add_src_param_old(arg, arg->src[2], arg->src_addr[2], src2_reg, src2_mask, src2_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - - shader_addline(arg->buffer, "%s(vec4(%s) * vec4(%s)) + vec4(%s))%s;\n", - tmpLine, src0_str, src1_str, src2_str, dst_mask); + write_mask = shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, src1_reg, src1_mask, src1_str); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, src2_reg, src2_mask, src2_str); + shader_addline(arg->buffer, "(%s * %s) + %s);\n", src0_str, src1_str, src2_str); } /** Handles transforming all WINED3DSIO_M?x? opcodes for

1 0

H. Verbeet : wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize.
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: b28bd67fd9a117a5261c93e1da123b81b3ebea5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28bd67fd9a117a5261c93e1d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:30:35 2007 +0100 wined3d: Fixup the write mask for gl_FogFragCoord and gl_PointSize. gl_FogFragCoord and gl_PointSize are floats rather than vec4s in GLSL, so they shouldn't have a destination swizzle, and the write mask we return should consist of only the first component. --- dlls/wined3d/glsl_shader.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d88e0e..51c7d32 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -725,12 +725,17 @@ static DWORD shader_glsl_get_write_mask( char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; - if (mask != WINED3DSP_WRITEMASK_ALL) { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + /* gl_FogFragCoord and glPointSize are floats, fixup the write mask. */ + if ((shader_get_regtype(param) == WINED3DSPR_RASTOUT) && ((param & WINED3DSP_REGNUM_MASK) != 0)) { + mask = WINED3DSP_WRITEMASK_0; + } else { + if (mask != WINED3DSP_WRITEMASK_ALL) { + *ptr++ = '.'; + if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; + if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; + if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; + if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + } } *ptr = '\0';

1 0