April 2009 - Wine-commits - list.winehq.org

Frans Kool : reg: Fixed Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 846ce4f0c4537d488c5cf8558a87f91562452dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846ce4f0c4537d488c5cf8558… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 22:23:44 2009 +0200 reg: Fixed Dutch translations. --- programs/reg/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/reg/Nl.rc b/programs/reg/Nl.rc index a3eaa28..c6a89f1 100644 --- a/programs/reg/Nl.rc +++ b/programs/reg/Nl.rc @@ -27,4 +27,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD sleutel_naam [/v waarde_naam | /ve] [/t type] [/s scheidingsteken] [/d data] [/f]\n" STRING_DELETE_USAGE, "REG DELETE sleutel_naam [/v waarde_naam | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY sleutel_naam [/v waarde_naam | /ve] [/s]\n" + STRING_SUCCESS, "De bewerking is succesvol voltooid\n" + STRING_INVALID_KEY, "Fout: Foutieve sleutel naam\n" + STRING_INVALID_CMDLINE, "Fout: Foutieve commando regel parameters\n" + STRING_NO_REMOTE, "Fout: Sleutels konden niet toegevoegd worden aan de remote machine\n" + STRING_CANNOT_FIND, "Fout: Het systeem kon de gespecificeerde registry sleutel of waarde niet vinden\n" }

1 0

Frans Kool : regedit: Fixed Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 1eec7ab3608fd7a760eb26fbcc17ad7b0b35f77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eec7ab3608fd7a760eb26fbc… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 23:50:38 2009 +0200 regedit: Fixed Dutch translations. --- programs/regedit/Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/Nl.rc b/programs/regedit/Nl.rc index 3e92021..43154ed 100644 --- a/programs/regedit/Nl.rc +++ b/programs/regedit/Nl.rc @@ -282,6 +282,7 @@ BEGIN ID_EDIT_COPYKEYNAME "De naam van de geselecteerde sleutel naar het Klembord kopi�ren" ID_EDIT_FIND "Een tekenreeks zoeken in een sleutel, een waarde of gegevens" ID_EDIT_FINDNEXT "De opgegeven tekst nogmaals zoeken" + ID_EDIT_EXPORT "Exporteert de geselecteerde subsleutel van het register naar een tekst bestand" END STRINGTABLE DISCARDABLE

1 0

Frans Kool : shell32: Fixed Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: c95a69d29c5be990c337750e668790b96ce08bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95a69d29c5be990c337750e6… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Apr 16 00:13:54 2009 +0200 shell32: Fixed Dutch translations. --- dlls/shell32/shell32_Nl.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index ac3f18b..7bea2e8 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -281,9 +281,11 @@ STRINGTABLE IDS_NEWFOLDER "Nieuwe Map" - IDS_CPANEL_TITLE "Wine Control Panel" - IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_TITLE "Wine Controle Paneel" + IDS_CPANEL_NAME "Naam" + IDS_CPANEL_DESCRIPTION "Beschrijving" + + IDS_SHLEXEC_NOASSOC "Er is geen Windows programma geconfigureerd om dit soort bestanden te openen." } STRINGTABLE

1 0

Frans Kool : kernel32: Added Dutch translations.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 6a13a1f5894421a8708dca69d909940671db1626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a13a1f5894421a8708dca69d… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Thu Apr 16 00:33:04 2009 +0200 kernel32: Added Dutch translations. --- dlls/kernel32/kernel.rc | 1 + dlls/kernel32/nls/winerr_nld.mc | 3730 ++++++++++++++++++++++++++++++++++++ dlls/kernel32/nls/winerr_nld.mc.rc | 2286 ++++++++++++++++++++++ 3 files changed, 6017 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a13a1f5894421a8708dc…

1 0

Dan Kegel : ntdll: Add missing valgrind hook in RtlAllocateHeap.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 999bb6a0e9bdc741c65974a3c53af6f72a752a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=999bb6a0e9bdc741c65974a3c… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Apr 15 14:36:34 2009 -0700 ntdll: Add missing valgrind hook in RtlAllocateHeap. --- dlls/ntdll/heap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 674aee7..255a688 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1372,6 +1372,7 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) void *ret = allocate_large_block( heap, flags, size ); if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection ); if (!ret && (flags & HEAP_GENERATE_EXCEPTIONS)) RtlRaiseStatus( STATUS_NO_MEMORY ); + notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); TRACE("(%p,%08x,%08lx): returning %p\n", heap, flags, size, ret ); return ret; }

1 0

Henri Verbeet : wined3d: Don't die if a vertex shader has samplers.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: a7e2c2d70ce8cb1d537248c73f75ea21d41566f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e2c2d70ce8cb1d537248c73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Don't die if a vertex shader has samplers. This fixes a regression introduced by 38239be58ca709ca107752ca7d3fee0763832725. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 61c5701..0a9240d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -825,7 +825,8 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i); } - if(ps_args->np2_fixup & (1 << i)) { + if (pshader && ps_args->np2_fixup & (1 << i)) + { /* NP2/RECT textures in OpenGL use texcoords in the range [0,width]x[0,height] * while D3D has them in the (normalized) [0,1]x[0,1] range. * samplerNP2Fixup stores texture dimensions and is updated through

1 0

Henri Verbeet : wined3d: Group instruction context information together in struct wined3d_shader_context .
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 463de24e7b82a1340bbc486ca08ead3b8340eee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463de24e7b82a1340bbc486ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Group instruction context information together in struct wined3d_shader_context. --- dlls/wined3d/arb_program_shader.c | 195 +++++++++++++-------------- dlls/wined3d/baseshader.c | 9 +- dlls/wined3d/glsl_shader.c | 268 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 11 +- 4 files changed, 245 insertions(+), 238 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=463de24e7b82a1340bbc4…

1 0

Henri Verbeet : wined3d: Introduce struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: ff62cab5374a94f6689651369ffc1e5527a0f016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff62cab5374a94f6689651369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Introduce struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 97 ++++++++--------- dlls/wined3d/baseshader.c | 6 +- dlls/wined3d/glsl_shader.c | 209 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 9 ++- 4 files changed, 163 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff62cab5374a94f668965…

1 0

Henri Verbeet : wined3d: Store the register type in struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: 4de1dba2c5ef8e6fd03d1e8f80e23852c01cac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de1dba2c5ef8e6fd03d1e8f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the register type in struct wined3d_shader_src_param. --- dlls/wined3d/baseshader.c | 11 +++++++++-- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5d3fdcc..03403af 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -224,6 +224,14 @@ static void shader_parse_dst_param(DWORD param, DWORD addr_param, struct wined3d dst->addr_token = addr_param; } +static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d_shader_src_param *src) +{ + src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->token = param; + src->addr_token = addr_param; +} + /* Note that this does not count the loop register * as an address register. */ @@ -885,8 +893,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); - src_param[i].token = param; - src_param[i].addr_token = addr_token; + shader_parse_src_param(param, addr_token, &src_param[i]); } /* Call appropriate function for output target */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51349b2..ada70a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1944,7 +1944,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(shader_get_regtype(ins->src[0].token), ins->src[0].token & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(ins->src[0].register_type, ins->src[0].token & WINED3DSP_REGNUM_MASK)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); @@ -1958,9 +1958,9 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) DWORD src0reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; DWORD src1reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; DWORD src2reg = ins->src[2].token & WINED3DSP_REGNUM_MASK; - DWORD src0regtype = shader_get_regtype(ins->src[0].token); - DWORD src1regtype = shader_get_regtype(ins->src[1].token); - DWORD src2regtype = shader_get_regtype(ins->src[2].token); + DWORD src0regtype = ins->src[0].register_type; + DWORD src1regtype = ins->src[1].register_type; + DWORD src2regtype = ins->src[2].register_type; DWORD dstreg = ins->dst[0].register_idx; DWORD dstregtype = ins->dst[0].register_type; DWORD dst_mask = ins->dst[0].write_mask; @@ -2283,7 +2283,6 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - DWORD regtype = shader_get_regtype(ins->src[1].token); DWORD reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; const DWORD *control_values = NULL; const local_constant *constant; @@ -2295,7 +2294,8 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct * addressing. */ - if(regtype == WINED3DSPR_CONSTINT) { + if (ins->src[1].register_type == WINED3DSPR_CONSTINT) + { LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { if(constant->idx == reg) { control_values = constant->value; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85b1c92..0ad9116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -464,6 +464,7 @@ struct wined3d_shader_dst_param struct wined3d_shader_src_param { + WINED3DSHADER_PARAM_REGISTER_TYPE register_type; DWORD token; DWORD addr_token; };

1 0

Henri Verbeet : wined3d: Store the register index in struct wined3d_shader_src_param.
by Alexandre Julliard 16 Apr '09

16 Apr '09

Module: wine Branch: master Commit: b6668b0296aec30cac987ebd62f044c945d4b9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6668b0296aec30cac987ebd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the register index in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++-- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 40 ++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e1ee255..cd156ba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1154,7 +1154,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (shader_version < WINED3DPS_VERSION(2,0)) reg_sampler_code = dst->register_idx; else - reg_sampler_code = ins->src[1].token & WINED3DSP_REGNUM_MASK; + reg_sampler_code = ins->src[1].register_idx; /* projection flag: * 1.1, 1.2, 1.3: Use WINED3DTSS_TEXTURETRANSFORMFLAGS @@ -1260,7 +1260,6 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) BOOL is_color; int i; - DWORD src = ins->src[0].token & WINED3DSP_REGNUM_MASK; SHADER_BUFFER *buffer = ins->ctx->buffer; char reg_coord[40]; @@ -1290,6 +1289,8 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) } if(has_bumpmat) { + DWORD src = ins->src[0].register_idx; + /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", reg_dest_code); @@ -1433,7 +1434,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; DWORD reg = ins->dst[0].register_idx; - DWORD reg3 = ins->src[1].token & WINED3DSP_REGNUM_MASK; + DWORD reg3 = ins->src[1].register_idx; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[8]; @@ -1632,6 +1633,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) for (i = 0; i < nComponents; i++) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_hw_map2gl(&tmp_ins); + ++tmp_src[1].register_idx; ++tmp_src[1].token; } } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 03403af..8ae6a19 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -228,6 +228,7 @@ static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d { src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->register_idx = param & WINED3DSP_REGNUM_MASK; src->token = param; src->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ada70a8..0868b6c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1944,7 +1944,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0].register_type, ins->src[0].token & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(ins->src[0].register_type, ins->src[0].register_idx)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); @@ -1955,14 +1955,6 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); } else { - DWORD src0reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; - DWORD src1reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; - DWORD src2reg = ins->src[2].token & WINED3DSP_REGNUM_MASK; - DWORD src0regtype = ins->src[0].register_type; - DWORD src1regtype = ins->src[1].register_type; - DWORD src2regtype = ins->src[2].register_type; - DWORD dstreg = ins->dst[0].register_idx; - DWORD dstregtype = ins->dst[0].register_type; DWORD dst_mask = ins->dst[0].write_mask; struct wined3d_shader_dst_param dst = ins->dst[0]; @@ -1983,9 +1975,12 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) * The first lines may overwrite source parameters of the following lines. * Deal with that by using a temporary destination register if needed */ - if ((src0reg == dstreg && src0regtype == dstregtype) - || (src1reg == dstreg && src1regtype == dstregtype) - || (src2reg == dstreg && src2regtype == dstregtype)) + if ((ins->src[0].register_idx == ins->dst[0].register_idx + && ins->src[0].register_type == ins->dst[0].register_type) + || (ins->src[1].register_idx == ins->dst[0].register_idx + && ins->src[1].register_type == ins->dst[0].register_type) + || (ins->src[2].register_idx == ins->dst[0].register_idx + && ins->src[2].register_type == ins->dst[0].register_type)) { write_mask = shader_glsl_get_write_mask(&dst, mask_char); if (!write_mask) continue; @@ -2138,6 +2133,7 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_glsl_dot(&tmp_ins); + ++tmp_src[1].register_idx; ++tmp_src[1].token; } } @@ -2283,7 +2279,6 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - DWORD reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; const DWORD *control_values = NULL; const local_constant *constant; @@ -2297,7 +2292,8 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) if (ins->src[1].register_type == WINED3DSPR_CONSTINT) { LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { - if(constant->idx == reg) { + if (constant->idx == ins->src[1].register_idx) + { control_values = constant->value; break; } @@ -2408,25 +2404,21 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { - - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; shader_addline(ins->ctx->buffer, "}\n"); - shader_addline(ins->ctx->buffer, "void subroutine%u () {\n", snum); + shader_addline(ins->ctx->buffer, "void subroutine%u () {\n", ins->src[0].register_idx); } static void shader_glsl_call(const struct wined3d_shader_instruction *ins) { - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; - shader_addline(ins->ctx->buffer, "subroutine%u();\n", snum); + shader_addline(ins->ctx->buffer, "subroutine%u();\n", ins->src[0].register_idx); } static void shader_glsl_callnz(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; shader_glsl_add_src_param(ins, ins->src[1].token, ins->src[1].addr_token, WINED3DSP_WRITEMASK_0, &src1_param); - shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, snum); + shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, ins->src[0].register_idx); } /********************************************* @@ -2446,7 +2438,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) /* 1.0-1.4: Use destination register as sampler source. * 2.0+: Use provided sampler source. */ if (shader_version < WINED3DPS_VERSION(2,0)) sampler_idx = ins->dst[0].register_idx; - else sampler_idx = ins->src[1].token & WINED3DSP_REGNUM_MASK; + else sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; if (shader_version < WINED3DPS_VERSION(1,4)) @@ -2531,7 +2523,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) DWORD sampler_idx; DWORD swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; - sampler_idx = ins->src[1].token & WINED3DSP_REGNUM_MASK; + sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; if(deviceImpl->stateBlock->textures[sampler_idx] && IWineD3DBaseTexture_GetTextureDimensions(deviceImpl->stateBlock->textures[sampler_idx]) == GL_TEXTURE_RECTANGLE_ARB) { @@ -2566,7 +2558,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", ins->dst[0].register_idx, dst_mask); } else { - DWORD reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->src[0].register_idx; DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; char dst_swizzle[6]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ad9116..9a476bc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -465,6 +465,7 @@ struct wined3d_shader_dst_param struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; + UINT register_idx; DWORD token; DWORD addr_token; };

1 0