January 2007 - Wine-Commits

H. Verbeet : wined3d: Simplify shader_glsl_get_swizzle().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: c6bccc927885c926d229aef2d8857f4159475efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6bccc927885c926d229aef2d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:46 2007 +0100 wined3d: Simplify shader_glsl_get_swizzle(). --- dlls/wined3d/glsl_shader.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a77431..f0fe216 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -734,21 +734,16 @@ static void shader_glsl_get_swizzle(cons /* 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 * and z components. */ + DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; const char *swizzle_chars = fixup ? "zyxw" : "xyzw"; char *ptr = swizzle_str; - /* swizzle bits fields: wwzzyyxx */ - DWORD swizzle = (param & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; - DWORD swizzle_x = swizzle & 0x03; - DWORD swizzle_y = (swizzle >> 2) & 0x03; - DWORD swizzle_z = (swizzle >> 4) & 0x03; - DWORD swizzle_w = (swizzle >> 6) & 0x03; - *ptr++ = '.'; - if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle_x]; - if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = swizzle_chars[swizzle_y]; - if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = swizzle_chars[swizzle_z]; - if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = swizzle_chars[swizzle_w]; + /* swizzle bits fields: wwzzyyxx */ + if (mask & WINED3DSP_WRITEMASK_0) *ptr++ = swizzle_chars[swizzle & 0x03]; + if (mask & WINED3DSP_WRITEMASK_1) *ptr++ = swizzle_chars[(swizzle >> 2) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_2) *ptr++ = swizzle_chars[(swizzle >> 4) & 0x03]; + if (mask & WINED3DSP_WRITEMASK_3) *ptr++ = swizzle_chars[(swizzle >> 6) & 0x03]; *ptr = '\0'; }

1 0

H. Verbeet : wined3d: Fix pshader_glsl_tex() and pshader_glsl_texcoord().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 48f82d3f5e59ce136b5361e770cfa141c45ec671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f82d3f5e59ce136b5361e77… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:40 2007 +0100 wined3d: Fix pshader_glsl_tex() and pshader_glsl_texcoord(). --- dlls/wined3d/glsl_shader.c | 183 +++++++++++++++++++++++++------------------- 1 files changed, 104 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48f82d3f5e59ce136b536…

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_callnz().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: c3bfef8d7e284cadc6dfc5478af952dbf76c5dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3bfef8d7e284cadc6dfc5478… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:35 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_callnz(). --- 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 ed501bc..1e706e9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1492,7 +1492,7 @@ void shader_glsl_callnz(SHADER_OPCODE_AR char src1_mask[6]; DWORD snum = (arg->src[0]) & WINED3DSP_REGNUM_MASK; - 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(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, src1_reg, src1_mask, src1_str); shader_addline(arg->buffer, "if (%s) subroutine%lu();\n", src1_str, snum); }

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_if().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: a89edf1be94e64ac08c6f507c93f7ec0a3e69560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89edf1be94e64ac08c6f507c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:04 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_if(). --- 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 0d7e402..3a4706f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1434,7 +1434,7 @@ void shader_glsl_if(SHADER_OPCODE_ARG* a char src0_reg[50]; char src0_mask[6]; - 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(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src0_reg, src0_mask, src0_str); shader_addline(arg->buffer, "if (%s) {\n", src0_str); }

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_ifc().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: f593cd0de89d66710507eaaa8d2f05477d48c0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f593cd0de89d66710507eaaa8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:19 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_ifc(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3a4706f..63c3fb1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1444,8 +1444,8 @@ void shader_glsl_ifc(SHADER_OPCODE_ARG* char src0_reg[50], src1_reg[50]; char src0_mask[6], src1_mask[6]; - 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(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[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, src1_reg, src1_mask, src1_str); shader_addline(arg->buffer, "if (%s %s %s) {\n", src0_str, shader_get_comp_op(arg->opcode_token), src1_str);

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_breakc().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 50e0deafcacb9657ca750e81e2216ecc72bdcc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e0deafcacb9657ca750e81e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:29 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_breakc(). --- dlls/wined3d/glsl_shader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 63c3fb1..ed501bc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1459,14 +1459,15 @@ void shader_glsl_break(SHADER_OPCODE_ARG shader_addline(arg->buffer, "break;\n"); } +/* FIXME: According to MSDN the compare is done per component. */ void shader_glsl_breakc(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]; - 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(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[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, src1_reg, src1_mask, src1_str); shader_addline(arg->buffer, "if (%s %s %s) break;\n", src0_str, shader_get_comp_op(arg->opcode_token), src1_str);

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_rep().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 9f22df26efce998c0285684fdc1d3d2ac9f55ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f22df26efce998c0285684fd… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:35:56 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_rep(). --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4d575d6..0d7e402 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1424,8 +1424,8 @@ void shader_glsl_rep(SHADER_OPCODE_ARG* char src0_reg[50]; char src0_mask[6]; - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str); - shader_addline(arg->buffer, "for (tmpInt = 0; tmpInt < %s.x; tmpInt++) {\n", src0_reg); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src0_reg, src0_mask, src0_str); + shader_addline(arg->buffer, "for (tmpInt = 0; tmpInt < %s; tmpInt++) {\n", src0_str); } void shader_glsl_if(SHADER_OPCODE_ARG* arg) {

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_loop().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: 2cb49c67dbfde20a154a78bd349c919fb63fbe6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb49c67dbfde20a154a78bd3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:36:11 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_loop(). Fix the comment. --- dlls/wined3d/glsl_shader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 97cb950..4d575d6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1397,17 +1397,18 @@ void shader_glsl_sincos(SHADER_OPCODE_AR } /** Process the WINED3DSIO_LOOP instruction in GLSL: - * Start a for() loop where src0.y is the initial value of aL, - * increment aL by src0.z for a total of src0.x iterations. + * Start a for() loop where src1.y is the initial value of aL, + * increment aL by src1.z for a total of src1.x iterations. * Need to use a temporary variable for this operation. */ +/* FIXME: I don't think nested loops will work correctly this way. */ void shader_glsl_loop(SHADER_OPCODE_ARG* arg) { char src1_str[100]; char src1_reg[50]; char src1_mask[6]; - 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(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_ALL, src1_reg, src1_mask, src1_str); shader_addline(arg->buffer, "for (tmpInt = 0, aL = %s.y; tmpInt < %s.x; tmpInt++, aL += %s.z) {\n", src1_reg, src1_reg, src1_reg);

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3vspec().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: cf1a3cc81a5696607a41242cf6fcca7c9cc93286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1a3cc81a5696607a41242cf… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:35:48 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3vspec(). Use shader_glsl_get_sample_function(). Use the GLSL builtin reflect() function. --- dlls/wined3d/glsl_shader.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7334ab3..97cb950 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1761,27 +1761,31 @@ void pshader_glsl_texm3x3vspec(SHADER_OP DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &shader->baseShader.parse_state; - char dst_str[8]; - char src0_str[100], src0_name[50], src0_mask[6]; + char src0_str[100], src0_name[50], src0_mask[6], dst_mask[6]; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + DWORD sampler_type = arg->reg_maps->samplers[reg] & WINED3DSP_TEXTURETYPE_MASK; + glsl_sample_function_t sample_function; - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); /* Perform the last matrix multiply operation */ shader_addline(buffer, "tmp0.z = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); /* Construct the eye-ray vector from w coordinates */ - shader_addline(buffer, "tmp1.x = gl_TexCoord[%u].w;\n", current_state->texcoord_w[0]); - shader_addline(buffer, "tmp1.y = gl_TexCoord[%u].w;\n", current_state->texcoord_w[1]); - shader_addline(buffer, "tmp1.z = gl_TexCoord[%u].w;\n", reg); + shader_addline(buffer, "tmp1.xyz = normalize(vec3(gl_TexCoord[%u].w, gl_TexCoord[%u].w, gl_TexCoord[%u].w));\n", + current_state->texcoord_w[0], current_state->texcoord_w[1], reg); - /* Calculate reflection vector (Assume normal is normalized): RF = 2*(N.E)*N -E */ - shader_addline(buffer, "tmp0.x = dot(vec3(tmp0), vec3(tmp1));\n"); - shader_addline(buffer, "tmp0 = tmp0.w * tmp0;\n"); - shader_addline(buffer, "tmp0 = (2.0 * tmp0) - tmp1;\n"); + /* Calculate reflection vector (Assume normal is normalized): RF = 2*(tmp0.tmp1)*tmp0-tmp1 + * This is equavalent to reflect(-tmp1, tmp0); */ + shader_addline(buffer, "tmp0.xyz = reflect(-tmp1.xyz, tmp0.xyz);\n"); + + shader_glsl_append_dst(buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_glsl_get_sample_function(sampler_type, FALSE, &sample_function); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); - shader_glsl_sample(arg, reg, dst_str, "tmp0"); + shader_addline(buffer, "%s(Psampler%u, tmp0.xyz)%s);\n", sample_function.name, reg, dst_mask); + current_state->current_row = 0; }

1 0

H. Verbeet : wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3spec().
by Alexandre Julliard Jan. 16, 2007

Jan. 16, 2007

Module: wine Branch: master Commit: f0fb61daedf330f4807c884a112c3b344dcd4f27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fb61daedf330f4807c884a1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:35:36 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3spec(). Use shader_glsl_get_sample_function(). --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 47a49f8..7334ab3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1724,36 +1724,32 @@ void pshader_glsl_texm3x3spec(SHADER_OPC IWineD3DPixelShaderImpl* shader = (IWineD3DPixelShaderImpl*) arg->shader; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; - char dimensions[5]; - char dst_str[8]; char src0_str[100], src0_name[50], src0_mask[6]; char src1_str[100], src1_name[50], src1_mask[6]; + char dst_mask[6]; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &shader->baseShader.parse_state; DWORD stype = arg->reg_maps->samplers[reg] & WINED3DSP_TEXTURETYPE_MASK; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + glsl_sample_function_t sample_function; - switch (stype) { - case WINED3DSTT_2D: strcpy(dimensions, "2D"); break; - case WINED3DSTT_CUBE: strcpy(dimensions, "Cube"); break; - case WINED3DSTT_VOLUME: strcpy(dimensions, "3D"); break; - default: - strcpy(dimensions, ""); - FIXME("Unrecognized sampler type: %#x\n", stype); - break; - } - - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str); - shader_glsl_add_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_name, src1_mask, src1_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], src_mask, src1_name, src1_mask, src1_str); /* Perform the last matrix multiply operation */ - shader_addline(buffer, "tmp0.z = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); + shader_addline(buffer, "tmp0.z = dot(T%u.xyz, %s);\n", reg, src0_str); - /* Calculate reflection vector */ - shader_addline(buffer, "tmp0.xyz = reflect(-vec3(%s), vec3(tmp0));\n", src1_str); + /* Calculate reflection vector, 2*(tmp0.src1)*tmp0-src1 + * This is equavalent to reflect(-src1, tmp0); */ + shader_addline(buffer, "tmp0.xyz = reflect(-(%s), tmp0.xyz);\n", src1_str); + + shader_glsl_append_dst(buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_glsl_get_sample_function(stype, FALSE, &sample_function); /* Sample the texture */ - sprintf(dst_str, "T%u", reg); - shader_glsl_sample(arg, reg, dst_str, "tmp0"); + shader_addline(buffer, "%s(Psampler%u, tmp0.xyz)%s);\n", sample_function.name, reg, dst_mask); + current_state->current_row = 0; }

1 0