January 2007 - Wine-commits

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

16 Jan '07

Module: wine Branch: master Commit: 8325937ded2edbf473cecd4d3ba5396049571a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8325937ded2edbf473cecd4d3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:24 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texreg2ar. Use the correct source swizzle. --- dlls/wined3d/glsl_shader.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6b80eaf..461c153 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1799,19 +1799,17 @@ void pshader_glsl_texbem(SHADER_OPCODE_A /** Process the WINED3DSIO_TEXREG2AR instruction in GLSL * Sample 2D texture at dst using the alpha & red (wx) components of src as texture coordinates */ void pshader_glsl_texreg2ar(SHADER_OPCODE_ARG* arg) { - - char tmpLine[255]; - char dst_str[100], src0_str[100]; - char dst_reg[50], src0_reg[50]; - char dst_mask[6], src0_mask[6]; - DWORD src0_regnum = arg->src[0] & WINED3DSP_REGNUM_MASK; + char src0_str[100]; + char src0_reg[50]; + char src0_mask[6]; + DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; + char dst_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_append_dst(arg->buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_ALL, src0_reg, src0_mask, src0_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%stexture2D(Psampler%u, %s.yz))%s;\n", - tmpLine, src0_regnum, dst_reg, dst_mask); + shader_addline(arg->buffer, "texture2D(Psampler%u, %s.wx)%s);\n", sampler_idx, src0_reg, dst_mask); } /** Process the WINED3DSIO_TEXREG2GB instruction in GLSL

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 54137bacfa302353d5bf310268468a7351d1401e URL: http://source.winehq.org/git/wine.git/?a=commit;h=54137bacfa302353d5bf31026… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:32 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texreg2gb(). --- dlls/wined3d/glsl_shader.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 461c153..71bb15e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1815,19 +1815,17 @@ void pshader_glsl_texreg2ar(SHADER_OPCOD /** Process the WINED3DSIO_TEXREG2GB instruction in GLSL * Sample 2D texture at dst using the green & blue (yz) components of src as texture coordinates */ void pshader_glsl_texreg2gb(SHADER_OPCODE_ARG* arg) { + char src0_str[100]; + char src0_reg[50]; + char src0_mask[6]; + DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; + char dst_mask[6]; - char tmpLine[255]; - char dst_str[100], src0_str[100]; - char dst_reg[50], src0_reg[50]; - char dst_mask[6], src0_mask[6]; - DWORD src0_regnum = arg->src[0] & WINED3DSP_REGNUM_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_append_dst(arg->buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_ALL, src0_reg, src0_mask, src0_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%stexture2D(Psampler%u, %s.yz))%s;\n", - tmpLine, src0_regnum, dst_reg, dst_mask); + shader_addline(arg->buffer, "texture2D(Psampler%u, %s.yz)%s);\n", sampler_idx, src0_reg, dst_mask); } /** Process the WINED3DSIO_TEXREG2RGB instruction in GLSL

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 146093af3374cbe4e176ba66ce59b980f1ac2740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146093af3374cbe4e176ba66c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:06 2007 +0100 wined3d: Rewrite shader_glsl_rcp() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e02483d..7739cd2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1128,17 +1128,21 @@ void shader_glsl_expp(SHADER_OPCODE_ARG* /** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ void shader_glsl_rcp(SHADER_OPCODE_ARG* arg) { + char src_str[100]; + char src_reg[50]; + char src_mask[6]; + DWORD write_mask; + size_t mask_size; - char tmpLine[256]; - char dst_str[100], src_str[100]; - char dst_reg[50], src_reg[50]; - char dst_mask[6], src_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], src_reg, src_mask, src_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - strcat(tmpLine, "1.0 / "); - shader_addline(arg->buffer, "%s%s)%s;\n", tmpLine, src_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, src_reg, src_mask, src_str); + + if (mask_size > 1) { + shader_addline(arg->buffer, "vec%d(1.0 / %s));\n", mask_size, src_str); + } else { + shader_addline(arg->buffer, "1.0 / %s);\n", src_str); + } } /** Process signed comparison opcodes in GLSL. */

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 7d07f3104563470395814d15c667ecc54d8e6ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d07f3104563470395814d15c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:15 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_dst(). --- dlls/wined3d/glsl_shader.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7739cd2..6b80eaf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1356,17 +1356,20 @@ void shader_glsl_lit(SHADER_OPCODE_ARG* * dst.w = src1.w */ void shader_glsl_dst(SHADER_OPCODE_ARG* arg) { + char src0y_str[100], src0z_str[100], src1y_str[100], src1w_str[100]; + char src0y_reg[50], src0z_reg[50], src1y_reg[50], src1w_reg[50]; + char dst_mask[6], src0y_mask[6], src0z_mask[6], src1y_mask[6], src1w_mask[6]; - 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_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str); + shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_1, src0y_reg, src0y_mask, src0y_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_2, src0z_reg, src0z_mask, src0z_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_1, src1y_reg, src1y_mask, src1y_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_3, src1w_reg, src1w_mask, src1w_str); - shader_addline(arg->buffer, "%s = vec4(1.0, %s.x * %s.y, %s.z, %s.w)%s;\n", - dst_str, src0_reg, src1_reg, src0_reg, src1_reg, dst_mask); + shader_addline(arg->buffer, "vec4(1.0, %s * %s, %s, %s))%s;\n", + src0y_str, src1y_str, src0z_str, src1w_str, dst_mask); } /** Process the WINED3DSIO_SINCOS instruction in GLSL:

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 2c60906ec4b1e9011fafe87cab34beace7f90a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c60906ec4b1e9011fafe87ca… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:54 2007 +0100 wined3d: Rewrite shader_glsl_cnd() to properly take the write mask into account. Take the difference between ps 1.4 and earlier versions into account. --- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7995d61..86f61e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1192,20 +1192,34 @@ void shader_glsl_cmp(SHADER_OPCODE_ARG* } /** Process the CND opcode in GLSL (dst = (src0 < 0.5) ? src1 : src2) */ +/* For ps 1.1-1.3, only a single component of src0 is used. For ps 1.4 + * the compare is done per component of src0. */ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { + IWineD3DBaseShaderImpl* shader = (IWineD3DBaseShaderImpl*) arg->shader; + 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, "%s(%s < 0.5) ? %s : %s)%s;\n", - tmpLine, src0_str, src1_str, src2_str, dst_mask); + write_mask = shader_glsl_append_dst(arg->buffer, arg); + + if (shader->baseShader.hex_version < WINED3DPS_VERSION(1, 4)) { + mask_size = 1; + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src0_reg, src0_mask, src0_str); + } else { + 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); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, src2_reg, src2_mask, src2_str); + + if (mask_size > 1) { + shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.5)))));\n", src2_str, src1_str, mask_size, src0_str, mask_size); + } else { + shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", src0_str, src1_str, src2_str); + } } /** GLSL code generation for WINED3DSIO_MAD: Multiply the first 2 opcodes, then add the last */

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 9857158a9952cd23992a139d2b9da094b08979fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9857158a9952cd23992a139d2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:01 2007 +0100 wined3d: Rewrite shader_glsl_expp() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 86f61e4..e02483d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1093,26 +1093,36 @@ void shader_glsl_map2gl(SHADER_OPCODE_AR * dst = 2^src; (partial precision is allowed, but optional) */ void shader_glsl_expp(SHADER_OPCODE_ARG* arg) { + IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)arg->shader; + char src_str[100]; + char src_reg[50]; + char src_mask[6]; - char tmpLine[256]; - char dst_str[100], src_str[100]; - char dst_reg[50], src_reg[50]; - char dst_mask[6], src_mask[6]; - IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; - DWORD hex_version = This->baseShader.hex_version; - - 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], src_reg, src_mask, src_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src_reg, src_mask, src_str); - if (hex_version < WINED3DPS_VERSION(2,0)) { - shader_addline(arg->buffer, "tmp0.x = vec4(exp2(floor(%s))).x;\n", src_str); - shader_addline(arg->buffer, "tmp0.y = vec4(%s - floor(%s)).y;\n", src_str, src_str); - shader_addline(arg->buffer, "tmp0.z = vec4(exp2(%s)).x;\n", src_str); + if (shader->baseShader.hex_version < WINED3DPS_VERSION(2,0)) { + char dst_mask[6]; + + shader_addline(arg->buffer, "tmp0.x = exp2(floor(%s));\n", src_str); + shader_addline(arg->buffer, "tmp0.y = %s - floor(%s);\n", src_str, src_str); + shader_addline(arg->buffer, "tmp0.z = exp2(%s);\n", src_str); shader_addline(arg->buffer, "tmp0.w = 1.0;\n"); - shader_addline(arg->buffer, "%svec4(tmp0))%s;\n", tmpLine, dst_mask); + + shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_addline(arg->buffer, "tmp0%s);\n", dst_mask); } else { - shader_addline(arg->buffer, "%svec4(exp2(%s)))%s;\n", tmpLine, src_str, dst_mask); + DWORD write_mask; + size_t mask_size; + + write_mask = shader_glsl_append_dst(arg->buffer, arg); + mask_size = shader_glsl_get_write_mask_size(write_mask); + + if (mask_size > 1) { + shader_addline(arg->buffer, "vec%d(exp2(%s)));\n", mask_size, src_str); + } else { + shader_addline(arg->buffer, "exp2(%s));\n", src_str); + } } }

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 693b6ef8763a6cb0789b2e59745f42f4f5f6187d URL: http://source.winehq.org/git/wine.git/?a=commit;h=693b6ef8763a6cb0789b2e597… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:48 2007 +0100 wined3d: Rewrite shader_glsl_cmp() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c1d8316..7995d61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1169,22 +1169,26 @@ void shader_glsl_compare(SHADER_OPCODE_A } } -/** Process CMP instruction in GLSL (dst = src0.x > 0.0 ? src1.x : src2.x), per channel */ +/** Process CMP instruction in GLSL (dst = src0 >= 0.0 ? src1 : src2), per channel */ void shader_glsl_cmp(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); + write_mask = shader_glsl_append_dst(arg->buffer, arg); + mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%smix(vec4(%s), vec4(%s), vec4(lessThan(vec4(%s), vec4(0.0)))))%s;\n", - tmpLine, src1_str, src2_str, src0_str, dst_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); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, src2_reg, src2_mask, src2_str); + + if (mask_size > 1) { + shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.0)))));\n", src1_str, src2_str, mask_size, src0_str, mask_size); + } else { + shader_addline(arg->buffer, "%s >= 0.0 ? %s : %s);\n", src0_str, src1_str, src2_str); + } } /** Process the CND opcode in GLSL (dst = (src0 < 0.5) ? src1 : src2) */

1 0

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

16 Jan '07

Module: wine Branch: master Commit: e0588e747530331b00d42ecee83a9028c9b03eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0588e747530331b00d42ecee… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:33 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_lit(). --- dlls/wined3d/glsl_shader.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6579e6d..7f66ba0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1297,17 +1297,26 @@ void shader_glsl_lrp(SHADER_OPCODE_ARG* * where src.w is clamped at +- 128 */ void shader_glsl_lit(SHADER_OPCODE_ARG* arg) { + char src0_str[100]; + char src0_reg[50]; + char src0_mask[6]; + char src1_str[100]; + char src1_reg[50]; + char src1_mask[6]; + char src3_str[100]; + char src3_reg[50]; + char src3_mask[6]; + char dst_mask[6]; - 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); + shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_1, src1_reg, src1_mask, src1_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_3, src3_reg, src3_mask, src3_str); - shader_addline(arg->buffer, - "%s = vec4(1.0, (%s.x > 0.0 ? %s.x : 0.0), (%s.x > 0.0 ? ((%s.y > 0.0) ? pow(%s.y, clamp(%s.w, -128.0, 128.0)) : 0.0) : 0.0), 1.0)%s;\n", - dst_str, src0_reg, src0_reg, src0_reg, src0_reg, src0_reg, src0_reg, dst_mask); + shader_addline(arg->buffer, "vec4(1.0, (%s > 0.0 ? %s : 0.0), (%s > 0.0 ? ((%s > 0.0) ? pow(%s, clamp(%s, -128.0, 128.0)) : 0.0) : 0.0), 1.0)%s);\n", + src0_str, src0_str, src0_str, src1_str, src1_str, src3_str, dst_mask); } /** Process the WINED3DSIO_DST instruction in GLSL:

1 0

H. Verbeet : wined3d: Rewrite shader_glsl_lrp() to properly take the write mask into account, use the GLSL mix instruction .
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 1414d75a3f80786f680fa5e3eb9c6952d2a0ecfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1414d75a3f80786f680fa5e3e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:40 2007 +0100 wined3d: Rewrite shader_glsl_lrp() to properly take the write mask into account, use the GLSL mix instruction. --- dlls/wined3d/glsl_shader.c | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7f66ba0..c1d8316 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1270,24 +1270,22 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* /** The LRP instruction performs a component-wise linear interpolation between the second and third operands using the first operand as the - blend factor. Equation: (dst = src2 * (src1 - src0) + src0) + blend factor. Equation: (dst = src2 + src0 * (src1 - src2)) + This is equivalent to mix(src2, src1, src0); */ void shader_glsl_lrp(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); + write_mask = shader_glsl_append_dst(arg->buffer, arg); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - - shader_addline(arg->buffer, "%s%s + %s * (%s - %s))%s;\n", - tmpLine, src2_str, src0_str, src1_str, src2_str, dst_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); + 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, "mix(%s, %s, %s));\n", src2_str, src1_str, src0_str); } /** Process the WINED3DSIO_LIT instruction in GLSL:

1 0

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

16 Jan '07

Module: wine Branch: master Commit: f3a4d35deefdfa8d712f6a02c160e55730f5d1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a4d35deefdfa8d712f6a02c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:32:13 2007 +0100 wined3d: Rewrite shader_glsl_dot() to properly take the write mask into account. --- dlls/wined3d/glsl_shader.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6008651..348fc77 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -978,29 +978,32 @@ void shader_glsl_mov(SHADER_OPCODE_ARG* /* Process the dot product operators DP3 and DP4 in GLSL (dst = dot(src0, src1)) */ void shader_glsl_dot(SHADER_OPCODE_ARG* arg) { - CONST SHADER_OPCODE* curOpcode = arg->opcode; SHADER_BUFFER* buffer = arg->buffer; - char tmpDest[100]; - 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]; - char cast[6]; + char src0_str[100], src1_str[100]; + char src0_reg[50], src1_reg[50]; + char src0_mask[6], src1_mask[6]; + DWORD dst_write_mask, src_write_mask; + size_t dst_size = 0; - 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); + dst_write_mask = shader_glsl_append_dst(buffer, arg); + dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpDest); - - /* Need to cast the src vectors to vec3 for dp3, and vec4 for dp4 */ - if (curOpcode->opcode == WINED3DSIO_DP4) - strcpy(cast, "vec4("); - else - strcpy(cast, "vec3("); - - shader_addline(buffer, "%sdot(%s%s), %s%s)))%s;\n", - tmpDest, cast, src0_str, cast, src1_str, dst_mask); + /* dp3 works on vec3, dp4 on vec4 */ + if (curOpcode->opcode == WINED3DSIO_DP4) { + src_write_mask = WINED3DSP_WRITEMASK_ALL; + } else { + src_write_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + } + + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_write_mask, src0_reg, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src_write_mask, src1_reg, src1_mask, src1_str); + + if (dst_size > 1) { + shader_addline(buffer, "vec%d(dot(%s, %s)));\n", dst_size, src0_str, src1_str); + } else { + shader_addline(buffer, "dot(%s, %s));\n", src0_str, src1_str); + } } /* Note that this instruction has some restrictions. The destination write mask

1 0