wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Stefan Dösinger : wined3d: Revert "WineD3D: use CMP instead of SLT and SGE in sRGB correction".
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 050735be79eb37fe057e14429a79ee9cf2235e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=050735be79eb37fe057e14429… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 16:01:00 2009 +0200 wined3d: Revert "WineD3D: use CMP instead of SLT and SGE in sRGB correction". This reverts patch ba35760f9fd5fd90a0fa34077862f04513d1ab16. The original patch did not achive its goal, because CMP is a macro that is expanded to SLT, SGE, MUL, MAD, at least on nvidia hardware. To make matters worse, it uses a temporary register, and the assembler usually is not clever enough to find a free temporary from the shader code. If we generate the code outselves we can pick one of our temps for this job. --- dlls/wined3d/arb_program_shader.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8cb3566..0f739b7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2018,7 +2018,7 @@ static GLuint create_arb_blt_fragment_program(const WineD3D_GL_Info *gl_info, en } static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcolor, const char *tmp1, - const char *tmp2, const char *tmp3) { + const char *tmp2, const char *tmp3, const char *tmp4) { /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ /* Calculate the > 0.0031308 case */ @@ -2029,9 +2029,14 @@ static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcol shader_addline(buffer, "SUB %s, %s, srgb_consts2.x;\n", tmp1, tmp1); /* Calculate the < case */ shader_addline(buffer, "MUL %s, srgb_consts1.x, %s;\n", tmp2, fragcolor); - /* Subtract the comparison value from the fragcolor and use CMP to pick either the > case * or the < case */ - shader_addline(buffer, "SUB %s, %s, srgb_consts1.y;\n", tmp3, fragcolor); - shader_addline(buffer, "CMP result.color.xyz, %s, %s, %s;\n", tmp3, tmp2, tmp1); + /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ + 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); + /* Add the components that are < 0.0031308 */ + shader_addline(buffer, "MAD result.color.xyz, %s, %s, %s;\n", tmp2, tmp4, fragcolor); + /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } /* GL locking is done by the caller */ @@ -2046,9 +2051,9 @@ 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; + BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; - char srgbtmp[3][4]; + char srgbtmp[4][4]; unsigned int i, found = 0; for(i = 0; i < This->baseShader.limits.temporary; i++) { @@ -2060,23 +2065,30 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, if(reg_maps->temporary[i]) { sprintf(srgbtmp[found], "R%u", i); found++; - if(found == 3) break; + if(found == 4) break; } } switch(found) { - case 3: dcl_tmp = FALSE; break; + case 4: dcl_tmp = FALSE; break; case 0: sprintf(srgbtmp[0], "TA"); sprintf(srgbtmp[1], "TB"); sprintf(srgbtmp[2], "TC"); + sprintf(srgbtmp[3], "TD"); + dcl_td = TRUE; break; case 1: sprintf(srgbtmp[1], "TA"); sprintf(srgbtmp[2], "TB"); + sprintf(srgbtmp[3], "TC"); break; case 2: sprintf(srgbtmp[2], "TA"); + sprintf(srgbtmp[3], "TB"); + break; + case 3: + sprintf(srgbtmp[3], "TA"); break; } @@ -2116,6 +2128,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, shader_addline(buffer, "TEMP TA;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TB;\n"); /* Used for modifiers */ shader_addline(buffer, "TEMP TC;\n"); /* Used for modifiers */ + if(dcl_td) shader_addline(buffer, "TEMP TD;\n"); /* Used for sRGB writing */ shader_addline(buffer, "PARAM coefdiv = { 0.5, 0.25, 0.125, 0.0625 };\n"); shader_addline(buffer, "PARAM coefmul = { 2, 4, 8, 16 };\n"); shader_addline(buffer, "PARAM one = { 1.0, 1.0, 1.0, 1.0 };\n"); @@ -2150,7 +2163,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, srgbtmp[0], srgbtmp[1], srgbtmp[2]); + 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); @@ -3609,7 +3622,7 @@ 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"); + 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

Stefan Dösinger : wined3d: Use Rx registers for sRGB correction if possible.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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

Alexandre Julliard : winegcc: Add support for building PE executables using Mingw.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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 01 Jun '09

01 Jun '09

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

Alexandre Julliard : winegcc: Don't pass the as/ld/ nm tool names to winebuild.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: b09418b5d263e3a9ed94c7b7538879de2c2ce528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09418b5d263e3a9ed94c7b75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 30 13:03:20 2009 +0200 winegcc: Don't pass the as/ld/nm tool names to winebuild. --- Make.rules.in | 6 - configure | 306 --------------------------------------------- configure.ac | 3 - tools/winegcc/Makefile.in | 3 - tools/winegcc/winegcc.c | 12 +-- 5 files changed, 2 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b09418b5d263e3a9ed94c…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009