May 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Allow the ARB shader backend to work with GL implementations with low amounts of native parameters .
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 87f34ce5f9ca98d5c767cc4d5eeac3c33eb25b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f34ce5f9ca98d5c767cc4d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 29 23:41:31 2010 +0200 wined3d: Allow the ARB shader backend to work with GL implementations with low amounts of native parameters. --- dlls/wined3d/arb_program_shader.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3852847..fd719c2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -671,12 +671,23 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if (pshader) { max_constantsF = gl_info->limits.arb_ps_native_constants; + /* 24 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. */ + if (max_constantsF < 24) + max_constantsF = gl_info->limits.arb_ps_float_constants; } else { + max_constantsF = gl_info->limits.arb_vs_native_constants; + /* 96 is the minimum MAX_PROGRAM_ENV_PARAMETERS_ARB value. + * Also prevents max_constantsF from becoming less than 0 and + * wrapping . */ + if (max_constantsF < 96) + max_constantsF = gl_info->limits.arb_vs_float_constants; + if(This->baseShader.reg_maps.usesrelconstF) { DWORD highest_constf = 0, clip_limit; - max_constantsF = gl_info->limits.arb_vs_native_constants - reserved_vs_const(iface, gl_info); + + max_constantsF -= reserved_vs_const(iface, gl_info); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); for(i = 0; i < This->baseShader.limits.constant_float; i++) @@ -709,7 +720,6 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s { if (ctx->target_version >= NV2) *num_clipplanes = gl_info->limits.clipplanes; else *num_clipplanes = min(gl_info->limits.clipplanes, 4); - max_constantsF = gl_info->limits.arb_vs_native_constants; } } @@ -4664,11 +4674,19 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *pCaps) { - DWORD vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); - DWORD ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); - if (gl_info->supported[ARB_VERTEX_PROGRAM]) { + DWORD vs_consts; + + /* 96 is the minimum allowed value of MAX_PROGRAM_ENV_PARAMETERS_ARB + * for vertex programs. If the native limit is less than that it's + * not very useful, and e.g. Mesa swrast returns 0, probably to + * indicate it's a software implementation. */ + if (gl_info->limits.arb_vs_native_constants < 96) + vs_consts = gl_info->limits.arb_vs_float_constants; + else + vs_consts = min(gl_info->limits.arb_vs_float_constants, gl_info->limits.arb_vs_native_constants); + if (gl_info->supported[NV_VERTEX_PROGRAM3]) { pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); @@ -4695,6 +4713,15 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { + DWORD ps_consts; + + /* Similar as above for vertex programs, but the minimum for fragment + * programs is 24. */ + if (gl_info->limits.arb_ps_native_constants < 24) + ps_consts = gl_info->limits.arb_ps_float_constants; + else + ps_consts = min(gl_info->limits.arb_ps_float_constants, gl_info->limits.arb_ps_native_constants); + if (gl_info->supported[NV_FRAGMENT_PROGRAM2]) { pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0);

1 0

Paul Vriens : winmm: Update Dutch translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: be7c8113387f43db81afa2af7de226bd9382d547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be7c8113387f43db81afa2af7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 30 14:18:46 2010 +0200 winmm: Update Dutch translation. --- dlls/winmm/winmm_Nl.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be7c8113387f43db81afa…

1 0

Paul Vriens : msi: Update Dutch translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 1cc32247e07ed5a52a961bea275af6c038a9dc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc32247e07ed5a52a961bea2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 30 14:34:51 2010 +0200 msi: Update Dutch translation. --- dlls/msi/msi_Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index da30430..70af83e 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Het opgegeven installatie pakket kon niet worden geopend. Verifieer het bestandspad en probeer opnieuw." 5 "Pad %s niet gevonden" 9 "Plaats disk %s" 10 "Ongeldige parameters"

1 0

Sven Baars : msi: Fix Dutch translation.
by Alexandre Julliard 03 May '10

03 May '10

Module: wine Branch: master Commit: 2d2823ae44a69097b7d4e814d02e5d2a7e2d3bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2823ae44a69097b7d4e814d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Apr 30 15:24:33 2010 +0200 msi: Fix Dutch translation. --- dlls/msi/msi_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index 70af83e..c028240 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -29,8 +29,8 @@ STRINGTABLE DISCARDABLE 9 "Plaats disk %s" 10 "Ongeldige parameters" 11 "Voer de map in die %s bevat" - 12 "De installatiebron van het feature ontbreekt" - 13 "De netwerkschijf met het feature ontbreekt" + 12 "De installatiebron van de feature ontbreekt" + 13 "De netwerkschijf met de feature ontbreekt" 14 "Feature van:" 15 "Kies de map die %s bevat" }

1 0

Alexandre Julliard : patches: Add server-side scripts for testbot result handling.
by Alexandre Julliard 03 May '10

03 May '10

Module: tools Branch: master Commit: 8cddf9b3b753a825fa4633af607ba72d8d27e6a6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8cddf9b3b753a825fa4633af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 3 13:38:34 2010 +0200 patches: Add server-side scripts for testbot result handling. --- patches/expire | 6 +++ patches/filter-testbot | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ patches/notify-bot | 35 ++++++++++++++++++++ 3 files changed, 123 insertions(+), 0 deletions(-) diff --git a/patches/expire b/patches/expire index 0b3ac8c..a990bfa 100755 --- a/patches/expire +++ b/patches/expire @@ -116,6 +116,8 @@ foreach my $file (sort readdir DIR) rename "$dir/$file", "$dir/OLD/$file"; rename "$dir/$file.status", "$dir/OLD/$file.status"; rename "$dir/$file.order", "$dir/OLD/$file.order"; + rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; + rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; } } else @@ -126,6 +128,8 @@ foreach my $file (sort readdir DIR) unlink "$dir/$file"; unlink "$dir/$file.status"; unlink "$dir/$file.order"; + unlink "$dir/$file.testbot"; + unlink "$dir/$file.testfail"; } } } @@ -154,6 +158,8 @@ foreach my $file (sort readdir DIR) unlink "$dir/OLD/$file"; unlink "$dir/OLD/$file.status"; unlink "$dir/OLD/$file.order"; + unlink "$dir/OLD/$file.testbot"; + unlink "$dir/OLD/$file.testfail"; } } } diff --git a/patches/filter-testbot b/patches/filter-testbot new file mode 100755 index 0000000..3c4e33b --- /dev/null +++ b/patches/filter-testbot @@ -0,0 +1,82 @@ +#!/usr/bin/perl -w +# +# Filter a testbot result report. +# +# Copyright 2010 Alexandre Julliard +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +use strict; + +my $step = 0; +my $patch = 0; +my $failed = 0; + +while (<>) +{ + if (/^--- BEGIN GENERAL ---$/) + { + $step = 1; + next; + } + if (/^--- BEGIN NEW_ERRORS ---$/) + { + $step = 2; + next; + } + if (/^--- BEGIN FULL_LOGS ---$/) + { + $step = 3; + next; + } + if (/^--- END GENERAL ---$/) + { + die "no patch id found" unless $patch > 0; + if ($failed) + { + open TESTFAIL, ">patches/$patch.testfail" or die "cannot create $patch.testfail"; + } + open TESTBOT, ">patches/$patch.testbot" or die "cannot create $patch.testbot"; + $step = 0; + next; + } + if (/^--- END/) + { + $step = 0; + next; + } + if ($step == 1 && /^Patch: (\d+)/) + { + $patch = $1; + next; + } + if ($step == 1 && /^Test-Result:\s+Failed/) + { + $failed = 1; + next; + } + if ($step == 2 && $failed) + { + print TESTFAIL $_; + next; + } + if ($step == 3) + { + print TESTBOT $_; + next; + } +} +close TESTFAIL if $failed; +close TESTBOT; diff --git a/patches/notify-bot b/patches/notify-bot new file mode 100755 index 0000000..104a496 --- /dev/null +++ b/patches/notify-bot @@ -0,0 +1,35 @@ +#!/bin/sh +# +# Notify winetestbot of the arrival of new patches +# +# Copyright 2010 Alexandre Julliard +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +notify_addr="$1" +subject="New patches available at http://source.winehq.org/patches" +test -n "$notify_addr" || exit 0 + +old=`cat $HOME/.next-patch` +next=$old +while test -f /home/winehq/opt/source/patches/data/$next +do + next=`expr $next + 1` +done +if test $next -gt $old +then + echo $next >$HOME/.next-patch + echo "The latest patch is `expr $next - 1`" | Mail -s "$subject" "$notify_addr" +fi

1 0