January 2007 - Wine-commits

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

16 Jan '07

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

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

16 Jan '07

Module: wine Branch: master Commit: 92ab90eee842774058eb3303e327e27b5813bc43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ab90eee842774058eb3303e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:35:06 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3pad(). --- 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 73912e4..29b4c26 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1638,6 +1638,7 @@ void pshader_glsl_texm3x2pad(SHADER_OPCO void pshader_glsl_texm3x3pad(SHADER_OPCODE_ARG* arg) { IWineD3DPixelShaderImpl* shader = (IWineD3DPixelShaderImpl*) arg->shader; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; SHADER_PARSE_STATE* current_state = &shader->baseShader.parse_state; @@ -1645,8 +1646,8 @@ void pshader_glsl_texm3x3pad(SHADER_OPCO char src0_name[50]; char src0_mask[6]; - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str); - shader_addline(buffer, "tmp0.%c = dot(vec3(T%u), vec3(%s));\n", 'x' + current_state->current_row, reg, src0_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); + shader_addline(buffer, "tmp0.%c = dot(T%u.xyz, %s);\n", 'x' + current_state->current_row, reg, src0_str); current_state->texcoord_w[current_state->current_row++] = reg; }

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 950783d4fd3c55eb2d36d38aa65e941a23bbd4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=950783d4fd3c55eb2d36d38aa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:35:14 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2tex(). --- dlls/wined3d/glsl_shader.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 29b4c26..1bb55a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1652,19 +1652,22 @@ void pshader_glsl_texm3x3pad(SHADER_OPCO } void pshader_glsl_texm3x2tex(SHADER_OPCODE_ARG* arg) { - char dst_str[8]; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; char src0_str[100]; char src0_name[50]; char src0_mask[6]; + char dst_mask[6]; - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str); - shader_addline(buffer, "tmp0.y = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); + shader_addline(buffer, "tmp0.y = dot(T%u.xyz, %s);\n", reg, src0_str); + + shader_glsl_append_dst(buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); /* Sample the texture using the calculated coordinates */ - sprintf(dst_str, "T%u", reg); - shader_glsl_sample(arg, reg, dst_str, "tmp0"); + shader_addline(buffer, "texture2D(Psampler%u, tmp0.xy)%s);\n", reg, dst_mask); } /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL

1 0

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

16 Jan '07

Module: wine Branch: master Commit: b26fae9a259c0e99e0151f64b029c76a83ae604e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26fae9a259c0e99e0151f64b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:35:22 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x3tex(). Use shader_glsl_get_sample_function(). --- dlls/wined3d/glsl_shader.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1bb55a0..c02b0e6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1673,20 +1673,27 @@ void pshader_glsl_texm3x2tex(SHADER_OPCO /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculated coordinates */ void pshader_glsl_texm3x3tex(SHADER_OPCODE_ARG* arg) { - char dst_str[8]; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; char src0_str[100]; char src0_name[50]; char src0_mask[6]; + char dst_mask[6]; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; + 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_addline(arg->buffer, "tmp0.z = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); + shader_addline(arg->buffer, "tmp0.z = dot(T%u.xyz, %s);\n", reg, src0_str); + + shader_glsl_append_dst(arg->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(arg->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_texm3x2depth().
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 04144983ebcc1aca1aa2192af504d84533ff14f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04144983ebcc1aca1aa2192af… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:34:33 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2depth(). --- dlls/wined3d/glsl_shader.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fea6892..8eda17a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1609,17 +1609,14 @@ void pshader_glsl_texdepth(SHADER_OPCODE * depth = (tmp0.y == 0.0) ? 1.0 : tmp0.x / tmp0.y */ void pshader_glsl_texm3x2depth(SHADER_OPCODE_ARG* arg) { - + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD dstreg = arg->dst & WINED3DSP_REGNUM_MASK; - char src0_str[100], dst_str[100]; - char src0_name[50], dst_name[50]; - char src0_mask[6], dst_mask[6]; + char src0_str[100], src0_name[50], src0_mask[6]; - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_name, dst_mask, dst_str); - 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); - shader_addline(arg->buffer, "tmp0.y = dot(vec3(T%u), vec3(%s));\n", dstreg, src0_str); - shader_addline(arg->buffer, "gl_FragDepth = vec4((tmp0.y == 0.0) ? 1.0 : tmp0.x / tmp0.y)%s;\n", dst_str, dst_name); + shader_addline(arg->buffer, "tmp0.y = dot(T%u.xyz, %s);\n", dstreg, src0_str); + shader_addline(arg->buffer, "gl_FragDepth = (tmp0.y == 0.0) ? 1.0 : clamp(tmp0.x / tmp0.y, 0.0, 1.0);\n"); } /** Process the WINED3DSIO_TEXM3X2PAD instruction in GLSL

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 459e0bf633eda47fd137e79f76b2dcb143f01dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459e0bf633eda47fd137e79f7… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:34:58 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texm3x2pad(). --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8eda17a..73912e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1622,15 +1622,15 @@ void pshader_glsl_texm3x2depth(SHADER_OP /** Process the WINED3DSIO_TEXM3X2PAD instruction in GLSL * Calculate the 1st of a 2-row matrix multiplication. */ void pshader_glsl_texm3x2pad(SHADER_OPCODE_ARG* arg) { - + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; SHADER_BUFFER* buffer = arg->buffer; char src0_str[100]; char src0_name[50]; char src0_mask[6]; - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str); - shader_addline(buffer, "tmp0.x = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); + shader_addline(buffer, "tmp0.x = dot(T%u.xyz, %s);\n", reg, src0_str); } /** Process the WINED3DSIO_TEXM3X3PAD instruction in GLSL

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 3cd84d9ab63471e0f0a657aaf7890dff47d95bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd84d9ab63471e0f0a657aaf… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:34:18 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texdp3tex(). --- dlls/wined3d/glsl_shader.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 82b750c..789d846 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1553,17 +1553,19 @@ void pshader_glsl_texcoord(SHADER_OPCODE * Take a 3-component dot product of the TexCoord[dstreg] and src, * then perform a 1D texture lookup from stage dstregnum, place into dst. */ void pshader_glsl_texdp3tex(SHADER_OPCODE_ARG* arg) { + char src0_str[100]; + char src0_name[50]; + char src0_mask[6]; + char dst_mask[6]; + DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - DWORD dstreg = arg->dst & WINED3DSP_REGNUM_MASK; - char src0_str[100], dst_str[100]; - char src0_name[50], dst_name[50]; - char src0_mask[6], dst_mask[6]; - - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_name, dst_mask, dst_str); - 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); - shader_addline(arg->buffer, "tmp0.x = dot(vec3(gl_TexCoord[%u]), vec3(%s));\n", dstreg, src0_str); - shader_addline(arg->buffer, "%s = vec4(texture1D(Psampler%u, tmp0.x))%s;\n", dst_str, dstreg, dst_mask); + shader_glsl_append_dst(arg->buffer, arg); + shader_glsl_get_write_mask(arg->dst, dst_mask); + shader_addline(arg->buffer, "texture1D(Psampler%u, dot(gl_TexCoord[%u].xyz, %s))%s);\n", + sampler_idx, sampler_idx, src0_str, dst_mask); } /** Process the WINED3DSIO_TEXDP3 instruction in GLSL:

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 1947b27380a182f7ec370939243d4649fc7ab91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1947b27380a182f7ec3709392… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:34:25 2007 +0100 wined3d: Pass the correct mask to shader_glsl_add_src_param() in pshader_glsl_texdp3(). --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 789d846..fea6892 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1571,17 +1571,23 @@ void pshader_glsl_texdp3tex(SHADER_OPCOD /** Process the WINED3DSIO_TEXDP3 instruction in GLSL: * Take a 3-component dot product of the TexCoord[dstreg] and src. */ void pshader_glsl_texdp3(SHADER_OPCODE_ARG* arg) { - + char src0_str[100]; + char src0_name[50]; + char src0_mask[6]; DWORD dstreg = arg->dst & WINED3DSP_REGNUM_MASK; - char src0_str[100], dst_str[100]; - char src0_name[50], dst_name[50]; - char src0_mask[6], dst_mask[6]; + DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + DWORD dst_mask; + size_t mask_size; - shader_glsl_add_dst_param(arg, arg->dst, 0, dst_name, dst_mask, dst_str); - shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_name, src0_mask, src0_str); + dst_mask = shader_glsl_append_dst(arg->buffer, arg); + mask_size = shader_glsl_get_write_mask_size(dst_mask); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], src_mask, src0_name, src0_mask, src0_str); - shader_addline(arg->buffer, "%s = vec4(dot(vec3(T%u), vec3(%s)))%s;\n", - dst_str, dstreg, src0_str, dst_mask); + if (mask_size > 1) { + shader_addline(arg->buffer, "vec%d(dot(T%u.xyz, %s)));\n", mask_size, dstreg, src0_str); + } else { + shader_addline(arg->buffer, "dot(T%u.xyz, %s));\n", dstreg, src0_str); + } } /** Process the WINED3DSIO_TEXDEPTH instruction in GLSL:

1 0

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

16 Jan '07

Module: wine Branch: master Commit: 0fcb682af6e2b356283308b26348c1765b4787e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fcb682af6e2b356283308b26… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:44 2007 +0100 wined3d: Rewrite pshader_glsl_texreg2rgb to properly take the write mask into account. Use shader_glsl_get_sample_function() rather than having the instruction handler figure it out itself. Get rid of shader_glsl_add_dst_old(). --- dlls/wined3d/glsl_shader.c | 59 +++++++++----------------------------------- 1 files changed, 12 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0d0b72c..82b750c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -513,31 +513,6 @@ static const char * const shift_glsl_tab "0.5 * " /* 15 (d2) */ }; -/** Print the beginning of the generated GLSL string. example: "reg_name.xyzw = vec4(" - * Will also change the reg_mask if necessary (not all register types are equal in DX vs GL) */ -static void shader_glsl_add_dst_old(DWORD param, const char* reg_name, char* reg_mask, char* outStr) { - - int shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - char cast[6]; - - if ((shader_get_regtype(param) == WINED3DSPR_RASTOUT) - && ((param & WINED3DSP_REGNUM_MASK) != 0)) { - /* gl_FogFragCoord or glPointSize - both floats */ - strcpy(cast, "float"); - strcpy(reg_mask, ""); - - } else if (reg_name[0] == 'A') { - /* Address register for vertex shaders (ivec4) */ - strcpy(cast, "ivec4"); - - } else { - /* Everything else should be a 4 component float vector */ - strcpy(cast, "vec4"); - } - - sprintf(outStr, "%s%s = %s%s(", reg_name, reg_mask, shift_glsl_tab[shift], cast); -} - /* Generate a GLSL parameter that does the input modifier computation and return the input register/mask to use */ static void shader_glsl_gen_modifier ( const DWORD instr, @@ -1843,30 +1818,20 @@ void pshader_glsl_texreg2gb(SHADER_OPCOD /** Process the WINED3DSIO_TEXREG2RGB instruction in GLSL * Sample texture at dst using the rgb (xyz) components of src as texture coordinates */ void pshader_glsl_texreg2rgb(SHADER_OPCODE_ARG* arg) { + char src0_str[100]; + char src0_reg[50]; + char src0_mask[6]; + char dst_mask[6]; + DWORD sampler_idx = arg->dst & WINED3DSP_REGNUM_MASK; + DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; + glsl_sample_function_t sample_function; - char tmpLine[255]; - char dst_str[100], src0_str[100]; - char dst_reg[50], src0_reg[50]; - char dst_mask[6], src0_mask[6]; - char dimensions[5]; - DWORD src0_regnum = arg->src[0] & WINED3DSP_REGNUM_MASK; - DWORD stype = arg->reg_maps->samplers[src0_regnum] & WINED3DSP_TEXTURETYPE_MASK; - 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_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_get_sample_function(sampler_type, FALSE, &sample_function); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], sample_function.coord_mask, src0_reg, src0_mask, src0_str); - shader_glsl_add_dst_old(arg->dst, dst_reg, dst_mask, tmpLine); - shader_addline(arg->buffer, "%stexture%s(Psampler%u, %s.%s))%s;\n", - tmpLine, dimensions, src0_regnum, dst_reg, (stype == WINED3DSTT_2D) ? "xy" : "xyz", dst_mask); + shader_addline(arg->buffer, "%s(Psampler%u, %s)%s);\n", sample_function.name, sampler_idx, src0_str, dst_mask); } /** Process the WINED3DSIO_TEXKILL instruction in GLSL.

1 0

H. Verbeet : wined3d: Split out getting the sample function and coordinate mask from shader_glsl_sample ().
by Alexandre Julliard 16 Jan '07

16 Jan '07

Module: wine Branch: master Commit: 67e203215f57b4ec4e2dc6aa1edcf1f76cca6424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e203215f57b4ec4e2dc6aa1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jan 15 19:33:38 2007 +0100 wined3d: Split out getting the sample function and coordinate mask from shader_glsl_sample(). --- dlls/wined3d/glsl_shader.c | 68 ++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 71bb15e..0d0b72c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define GLINFO_LOCATION (*gl_info) +typedef struct { + const char *name; + DWORD coord_mask; +} glsl_sample_function_t; + /** Prints the GLSL info log which will contain error messages if they exist */ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { @@ -887,43 +892,50 @@ static inline const char* shader_get_com } } +static void shader_glsl_get_sample_function(DWORD sampler_type, BOOL projected, glsl_sample_function_t *sample_function) { + /* Note that there's no such thing as a projected cube texture. */ + switch(sampler_type) { + case WINED3DSTT_1D: + sample_function->name = projected ? "texture1DProj" : "texture1D"; + sample_function->coord_mask = WINED3DSP_WRITEMASK_0; + break; + case WINED3DSTT_2D: + sample_function->name = projected ? "texture2DProj" : "texture2D"; + sample_function->coord_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1; + break; + case WINED3DSTT_CUBE: + sample_function->name = "textureCube"; + sample_function->coord_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + break; + case WINED3DSTT_VOLUME: + sample_function->name = projected ? "texture3DProj" : "texture3D"; + sample_function->coord_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; + break; + default: + sample_function->name = ""; + FIXME("Unrecognized sampler type: %#x;\n", sampler_type); + break; + } +} + static void shader_glsl_sample(SHADER_OPCODE_ARG* arg, DWORD sampler_idx, const char *dst_str, const char *coord_reg) { IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD sampler_type = arg->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; const char sampler_prefix = shader_is_pshader_version(This->baseShader.hex_version) ? 'P' : 'V'; SHADER_BUFFER* buffer = arg->buffer; + glsl_sample_function_t sample_function; if(deviceImpl->stateBlock->textureState[sampler_idx][WINED3DTSS_TEXTURETRANSFORMFLAGS] & WINED3DTTFF_PROJECTED) { - /* Note that there's no such thing as a projected cube texture. */ - switch(sampler_type) { - case WINED3DSTT_2D: - shader_addline(buffer, "%s = texture2DProj(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - break; - case WINED3DSTT_VOLUME: - shader_addline(buffer, "%s = texture3DProj(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - break; - default: - shader_addline(buffer, "%s = unrecognized_stype(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - FIXME("Unrecognized sampler type: %#x;\n", sampler_type); - break; - } + shader_glsl_get_sample_function(sampler_type, TRUE, &sample_function); + shader_addline(buffer, "%s = %s(%csampler%u, %s);\n", dst_str, sample_function.name, sampler_prefix, sampler_idx, coord_reg); } else { - switch(sampler_type) { - case WINED3DSTT_2D: - shader_addline(buffer, "%s = texture2D(%csampler%u, %s.xy);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - break; - case WINED3DSTT_CUBE: - shader_addline(buffer, "%s = textureCube(%csampler%u, %s.xyz);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - break; - case WINED3DSTT_VOLUME: - shader_addline(buffer, "%s = texture3D(%csampler%u, %s.xyz);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - break; - default: - shader_addline(buffer, "%s = unrecognized_stype(%csampler%u, %s);\n", dst_str, sampler_prefix, sampler_idx, coord_reg); - FIXME("Unrecognized sampler type: %#x;\n", sampler_type); - break; - } + char coord_swizzle[6]; + + shader_glsl_get_sample_function(sampler_type, FALSE, &sample_function); + shader_glsl_get_write_mask(sample_function.coord_mask, coord_swizzle); + + shader_addline(buffer, "%s = %s(%csampler%u, %s%s);\n", dst_str, sample_function.name, sampler_prefix, sampler_idx, coord_reg, coord_swizzle); } }

1 0