June 2009 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Use Rx registers for sRGB correction if possible.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 8665ee5906578e6cfae52306b37db478f3bb9109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8665ee5906578e6cfae52306b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 15:59:42 2009 +0200 wined3d: Use Rx registers for sRGB correction if possible. This removes another reason to declare TA, TB and TC. --- dlls/wined3d/arb_program_shader.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 918f676..8cb3566 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2046,6 +2046,39 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, char fragcolor[16]; DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; + BOOL dcl_tmp = args->super.srgb_correction; + + char srgbtmp[3][4]; + unsigned int i, found = 0; + + for(i = 0; i < This->baseShader.limits.temporary; i++) { + + /* Don't overwrite the color source */ + if(This->color0_mov && i == This->color0_reg) continue; + else if(reg_maps->shader_version.major < 2 && i == 0) continue; + + if(reg_maps->temporary[i]) { + sprintf(srgbtmp[found], "R%u", i); + found++; + if(found == 3) break; + } + } + + switch(found) { + case 3: dcl_tmp = FALSE; break; + case 0: + sprintf(srgbtmp[0], "TA"); + sprintf(srgbtmp[1], "TB"); + sprintf(srgbtmp[2], "TC"); + break; + case 1: + sprintf(srgbtmp[1], "TA"); + sprintf(srgbtmp[2], "TB"); + break; + case 2: + sprintf(srgbtmp[2], "TA"); + break; + } /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); @@ -2117,7 +2150,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); if(args->super.srgb_correction) { - arbfp_add_sRGB_correction(buffer, fragcolor, "TA", "TB", "TC"); + arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2]); shader_addline(buffer, "MOV result.color.a, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor);

1 0

Aurimas Fišeras : kernel32/nls: Add missing translations for lth.nls.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 9ada7fb96683e44d39ae70f8e3367b25a41df9f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ada7fb96683e44d39ae70f8e… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri May 29 22:49:59 2009 +0300 kernel32/nls: Add missing translations for lth.nls. --- dlls/kernel32/nls/lth.nls | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/nls/lth.nls b/dlls/kernel32/nls/lth.nls index 9674e85..771b238 100644 --- a/dlls/kernel32/nls/lth.nls +++ b/dlls/kernel32/nls/lth.nls @@ -136,21 +136,21 @@ STRINGTABLE LANGUAGE LANG_LITHUANIAN, SUBLANG_LITHUANIAN LOCALE_STIMEFORMAT "HH:mm:ss" LOCALE_SYEARMONTH "yyyy 'm.' MMMM" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Vakar� Europos ir JAV" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Centrin�s Europos" + LGRPID_BALTIC+LGRPID_RES_BASE "Balt�" + LGRPID_GREEK+LGRPID_RES_BASE "Graik�" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Kirilica" + LGRPID_TURKISH+LGRPID_RES_BASE "Turk�" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japon�" + LGRPID_KOREAN+LGRPID_RES_BASE "Kor�jie�i�" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Kin� tradicin�" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Kin� supaprastinta" + LGRPID_THAI+LGRPID_RES_BASE "Taj�" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebraj�" + LGRPID_ARABIC+LGRPID_RES_BASE "Arab�" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamie�i�" + LGRPID_INDIC+LGRPID_RES_BASE "Ind�" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Gruzin�" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Arm�n�" }

1 0

Stefan Dösinger : wined3d: Write result. color in one mov.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 5a07bacd364c826171d3952070935bb77ca9eba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a07bacd364c826171d395207… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 16:03:55 2009 +0200 wined3d: Write result.color in one mov. Otherwise the Nvidia assembler needs one temp reg. --- dlls/wined3d/arb_program_shader.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0f739b7..2a34567 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2033,9 +2033,15 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol shader_addline(buffer, "SLT %s, srgb_consts1.y, %s;\n", tmp3, fragcolor); shader_addline(buffer, "SGE %s, srgb_consts1.y, %s;\n", tmp4, fragcolor); /* Store the components > 0.0031308 in the destination */ - shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); + shader_addline(buffer, "MUL %s.xyz, %s, %s;\n", fragcolor, tmp1, tmp3); /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD result.color.xyz, %s, %s, %s;\n", tmp2, tmp4, fragcolor); + shader_addline(buffer, "MAD %s.xyz, %s, %s, %s;\n", fragcolor, tmp2, tmp4, fragcolor); + /* Move everything into result.color at once. Nvidia hardware cannot handle partial + * result.color writes(.rgb first, then .a), or handle overwriting already written + * components. The assembler uses a temporary register in this case, which is usually + * not allocated from one of our registers that were used earlier. + */ + shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } @@ -2164,7 +2170,6 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, if(args->super.srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3]); - shader_addline(buffer, "MOV result.color.a, %s;\n", fragcolor); } else if(reg_maps->shader_version.major < 2) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } @@ -3623,7 +3628,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi if(settings->sRGB_write) { shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); - shader_addline(&buffer, "MOV result.color.w, ret.w;\n"); } else { shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); }

1 0

Alexandre Julliard : winegcc: Add support for building PE executables using Mingw.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 6f74b45a81f8e7763d2534476e313c0774160876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f74b45a81f8e7763d2534476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 15:24:07 2009 +0200 winegcc: Add support for building PE executables using Mingw. --- dlls/Makedll.rules.in | 4 +- dlls/Maketest.rules.in | 2 +- programs/Makeprog.rules.in | 4 +- programs/winetest/Makefile.in | 2 +- tools/winegcc/utils.c | 38 +++++----- tools/winegcc/utils.h | 12 +++- tools/winegcc/winegcc.c | 163 ++++++++++++++++++++++++++++++++--------- 7 files changed, 165 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f74b45a81f8e7763d253…

1 0

Alexandre Julliard : winegcc: Add support for the --sysroot option to allow out-of-tree cross-compiling.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: bcc1379bdab5bc79ae00dc3c9a844ced20f8c543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc1379bdab5bc79ae00dc3c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 2 15:11:13 2009 +0100 winegcc: Add support for the --sysroot option to allow out-of-tree cross-compiling. --- Make.rules.in | 2 +- tools/winegcc/winegcc.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index db84e90..a259da9 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -71,7 +71,7 @@ MAKECTESTS = $(TOOLSDIR)/tools/make_ctests WRC = $(TOOLSDIR)/tools/wrc/wrc WMC = $(TOOLSDIR)/tools/wmc/wmc WIDL = $(TOOLSDIR)/tools/widl/widl -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild +WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR) RELPATH = $(TOOLSDIR)/tools/relpath SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt FNT2FON = $(TOOLSDIR)/tools/fnt2fon diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 491a733..4e41033 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1154,6 +1154,12 @@ int main(int argc, char **argv) case '-': if (strcmp("-static", argv[i]+1) == 0) linking = -1; + else if (!strncmp("--sysroot", argv[i], 9) && opts.wine_objdir) + { + if (argv[i][9] == '=') opts.wine_objdir = argv[i] + 10; + else opts.wine_objdir = argv[++i]; + raw_compiler_arg = raw_linker_arg = 0; + } break; }

1 0