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

Paul Vriens : winmm/tests: Remove an unreliable test.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 1aa71ea39e31ecd87025e96d60c0640ca53e78bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa71ea39e31ecd87025e96d6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat May 30 20:43:31 2009 +0200 winmm/tests: Remove an unreliable test. --- dlls/winmm/tests/wave.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 6430667..b509f74 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -604,7 +604,6 @@ static void wave_out_test_deviceOut(int device, double duration, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE; double paused = 0.0; - DWORD actual; DWORD_PTR callback = 0; DWORD_PTR callback_instance = 0; HANDLE thread = 0; @@ -724,7 +723,7 @@ static void wave_out_test_deviceOut(int device, double duration, } if (interactive && rc==MMSYSERR_NOERROR) { - DWORD start,end; + DWORD start; trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration, sine ? "440Hz tone" : "silence",pwfx->nSamplesPerSec, pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ", @@ -791,13 +790,6 @@ static void wave_out_test_deviceOut(int device, double duration, } } - /* Check the sound duration was at least 90% of the expected value */ - end=GetTickCount(); - actual = end - start; - trace("sound duration=%u ms\n",actual); - ok(actual > 900 * (duration+paused), - "The sound played for %u ms instead of %g ms\n", - actual,1000*(duration+paused)); for (i = 0; i < headers; i++) { ok(frags[i].dwFlags==(WHDR_DONE|WHDR_PREPARED), "WHDR_DONE WHDR_PREPARED expected, got %s\n",

1 0

Yuriy Kaminskiy : dsound: Fix segv on use-after-free in IDirectSoundNotifyImpl_Release.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: cb93f15e32230d29637492be78d410d46e73d7ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb93f15e32230d29637492be7… Author: Yuriy Kaminskiy <yumkam(a)mail.ru> Date: Sat May 30 20:59:13 2009 +0400 dsound: Fix segv on use-after-free in IDirectSoundNotifyImpl_Release. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 251c436..2d64341 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -82,8 +82,8 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(LPDIRECTSOUNDNOTIFY iface) TRACE("(%p) ref was %d\n", This, ref + 1); if (!ref) { - IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); This->dsb->notify = NULL; + IDirectSoundBuffer_Release((LPDIRECTSOUNDBUFFER)This->dsb); HeapFree(GetProcessHeap(), 0, This); TRACE("(%p) released\n", This); }

1 0

Vitaliy Margolen : winecfg: Update WinXP version to SP3.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: 1e4b401a980f22a01913e1572d8e3091da9f2e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e4b401a980f22a01913e1572… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 31 15:21:00 2009 -0600 winecfg: Update WinXP version to SP3. --- dlls/ntdll/version.c | 4 ++-- programs/winecfg/appdefaults.c | 2 +- tools/wine.inf.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index d43a5b6..24531aa 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -128,8 +128,8 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WINXP */ { sizeof(RTL_OSVERSIONINFOEXW), 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, - {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, - 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','3',0}, + 3, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 30 /* FIXME: Great, a reserved field with a value! */ }, /* WIN2K3 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 8e48949..4df2a4a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -51,7 +51,7 @@ static const struct { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, { "vista", "Windows Vista", 6, 0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, - { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, + { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"}, { "winme", "Windows ME", 4, 90, 0xBB8, VER_PLATFORM_WIN32_WINDOWS, " ", 0, 0, ""}, { "win98", "Windows 98", 4, 10, 0x8AE, VER_PLATFORM_WIN32_WINDOWS, " A ", 0, 0, ""}, diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 25cec58..ccae9b9 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2929,9 +2929,9 @@ HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,,"" [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

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

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: 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

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

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: Write result. color in one mov.
by Alexandre Julliard 01 Jun '09

01 Jun '09

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

Stefan Dösinger : wined3d: Don' t enable the NV frag extensions if we don't need them.
by Alexandre Julliard 01 Jun '09

01 Jun '09

Module: wine Branch: master Commit: de12f880ced7318ba0f8a62946fe0bd292ce66d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de12f880ced7318ba0f8a6294… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 17:11:04 2009 +0200 wined3d: Don't enable the NV frag extensions if we don't need them. Enabling the NV extensions occupies a temp register for some reason. Avoid needlessly enabling it. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/wined3d/baseshader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2a34567..0d32bbc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2058,6 +2058,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, DWORD *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; BOOL dcl_tmp = args->super.srgb_correction, dcl_td = FALSE; + BOOL want_nv_prog = FALSE; char srgbtmp[4][4]; unsigned int i, found = 0; @@ -2103,14 +2104,38 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, priv_ctx.cur_ps_args = args; list_init(&priv_ctx.if_frames); + /* Avoid enabling NV_fragment_program* if we do not need it. + * + * Enabling GL_NV_fragment_program_option causes the driver to occupy a temporary register, + * and it slows down the shader execution noticeably(about 5%). Usually our instruction emulation + * is faster than what we gain from using higher native instructions. There are some things though + * that cannot be emulated. In that case enable the extensions. + * If the extension is enabled, instruction handlers that support both ways will use it. + * + * Testing shows no performance difference between OPTION NV_fragment_program2 and NV_fragment_program. + * So enable the best we can get. + */ + if(reg_maps->usesdsx || reg_maps->usesdsy || reg_maps->loop_depth > 0) + { + want_nv_prog = TRUE; + } + shader_addline(buffer, "!!ARBfp1.0\n"); - if(GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) { + if(want_nv_prog && GL_SUPPORT(NV_FRAGMENT_PROGRAM2)) { shader_addline(buffer, "OPTION NV_fragment_program2;\n"); priv_ctx.target_version = NV3; - } else if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { + } else if(want_nv_prog && GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); priv_ctx.target_version = NV2; } else { + if(want_nv_prog) + { + /* This is an error - either we're advertising the wrong shader version, or aren't enforcing some + * limits properly + */ + ERR("The shader requires instructions that are not available in plain GL_ARB_fragment_program\n"); + ERR("Try GLSL\n"); + } priv_ctx.target_version = ARB; } @@ -2131,6 +2156,10 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } } + /* For now always declare the temps. At least the Nvidia assembler optimizes completely + * unused temps away(but occupies them for the whole shader if they're used once). Always + * declaring them avoids tricky bookkeeping work + */ 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 */ @@ -2227,6 +2256,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); + /* Always enable the NV extension if available. Unlike fragment shaders, there is no + * mesurable performance penalty, and we can always make use of it for clipplanes. + */ if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) { shader_addline(buffer, "OPTION NV_vertex_program2;\n"); priv_ctx.target_version = NV2; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 9dcdbe6..1a34fa2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -683,6 +683,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 { reg_maps->usesdsy = 1; } + else if (ins.handler_idx == WINED3DSIH_DSX) + { + reg_maps->usesdsx = 1; + } else if(ins.handler_idx == WINED3DSIH_TEXLDD) { reg_maps->usestexldd = 1; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8b7bff8..f217366 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -632,7 +632,7 @@ typedef struct shader_reg_maps WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES]; - char usesnrm, vpos, usesdsy, usestexldd, usesmova; + char usesnrm, vpos, usesdsx, usesdsy, usestexldd, usesmova; char usesrelconstF; /* Whether or not loops are used in this shader, and nesting depth */

1 0