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

Francois Gouget : winapi: parse_c_declarations() is not used. Remove it.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: f8ae6d640776774f6838b2657156978035d25472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ae6d640776774f6838b2657… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 14:55:38 2009 +0200 winapi: parse_c_declarations() is not used. Remove it. --- tools/winapi/c_parser.pm | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 37f0db3..4d67bb9 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -663,19 +663,6 @@ sub parse_c_declaration($$$$$$$$$$$$) { } ######################################################################## -# parse_c_declarations - -sub parse_c_declarations($$$$) { - my $self = shift; - - my $refcurrent = shift; - my $refline = shift; - my $refcolumn = shift; - - return 1; -} - -######################################################################## # _parse_c sub _parse_c($$$$$$) {

1 0

Francois Gouget : winapi: Fix the parse_c_declaration() prototype and remove unused variables.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0dd5c442c1134778ac0b98cc57ab007b5832ac3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd5c442c1134778ac0b98cc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 15:08:03 2009 +0200 winapi: Fix the parse_c_declaration() prototype and remove unused variables. --- tools/winapi/c_parser.pm | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 4d67bb9..f549fc1 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -563,16 +563,13 @@ sub parse_c_block($$$$$$$) { ######################################################################## # parse_c_declaration -sub parse_c_declaration($$$$$$$$$$$$) { - my $self = shift; +sub parse_c_declaration($$$$) +{ + my ($self, $refcurrent, $refline, $refcolumn) = @_; my $found_declaration = \${$self->{FOUND_DECLARATION}}; my $found_function = \${$self->{FOUND_FUNCTION}}; - my $refcurrent = shift; - my $refline = shift; - my $refcolumn = shift; - local $_ = $$refcurrent; my $line = $$refline; my $column = $$refcolumn; @@ -591,18 +588,10 @@ sub parse_c_declaration($$$$$$$$$$$$) { } # Function - my $function = shift; - - my $linkage = shift; - my $calling_convention = shift; - my $return_type = shift; - my $name = shift; - my @arguments = shift; - my @argument_lines = shift; - my @argument_columns = shift; + my $function; # Variable - my $type; + my ($linkage, $type, $name); if(s/^WINE_(?:DEFAULT|DECLARE)_DEBUG_CHANNEL\s*$\s*(\w+)\s*$\s*//s) { # FIXME: Wine specific kludge $self->_update_c_position($&, \$line, \$column);

1 0

Francois Gouget : winapi: trampoline is not used so remove it.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 55cd3433ac956fd7b04da6443745fd238042323f URL: http://source.winehq.org/git/wine.git/?a=commit;h=55cd3433ac956fd7b04da6443… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 15:08:13 2009 +0200 winapi: trampoline is not used so remove it. --- tools/winapi/trampoline | 35 ----------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/tools/winapi/trampoline b/tools/winapi/trampoline deleted file mode 100755 index 0117316..0000000 --- a/tools/winapi/trampoline +++ /dev/null @@ -1,35 +0,0 @@ -#! /usr/bin/perl -w -# -# Copyright 1999, 2000, 2001 Patrik Stridvall -# -# 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -# - -use strict; - -require Cwd; - -my $tool = $0; -$tool =~ s%^(?:.*?/)?([^/]+)$%$1%; - -$_ = Cwd::cwd(); -while($_) { - my $file = "$_/tools/winapi/$tool"; - if(-e $file) { - exec("$file @ARGV"); - } - s%/[^/]*$%%; -} -print STDERR "$0: $tool: can't link to command\n";

1 0

Francois Gouget : winapi: Remove some dead code.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 9bdde98ab6d43b356586dafb446e36651ff4f939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bdde98ab6d43b356586dafb4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 15:08:33 2009 +0200 winapi: Remove some dead code. --- tools/winapi/c_parser.pm | 4 ---- tools/winapi/winapi.pm | 8 +------- tools/winapi/winapi_test | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index f549fc1..b93e461 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1873,10 +1873,6 @@ sub parse_c_typedef($$$$) { &$$found_type($type); } - - if (0 && $_ && !/^,/) { - $self->_parse_c_error($_, $line, $column, "typedef"); - } } else { $self->_parse_c_error($_, $line, $column, "typedef"); } diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index f5279e1..491063e 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -315,13 +315,7 @@ sub parse_spec_file($$) { if ($internal_name =~ /^(.*?)\.(.*?)$/) { my $forward_module = lc($1); my $forward_name = $2; - - if (0) { - $calling_convention .= " -forward"; - } else { - $calling_convention = "forward"; - } - + $calling_convention = "forward"; $$function_forward{$module}{$external_name} = [$forward_module, $forward_name]; } diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 58333dc..7288a2e 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -180,9 +180,7 @@ sub _find_align_kind_size($) { my $align; my $kind; my $size; - if (0) { - # Nothing - } elsif (/\*+$/) { + if (/\*+$/) { $align = 4; $kind = "pointer"; $size = 4;

1 0

Francois Gouget : winapi: Fix the C-parser combined getter/ setter prototypes.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: dbfe7b7b68c43a6456d85550acc32f08b4aeeec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe7b7b68c43a6456d85550a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 15:09:09 2009 +0200 winapi: Fix the C-parser combined getter/setter prototypes. --- tools/winapi/c_function.pm | 50 ++++++++++++++++++++++++++++++------------- tools/winapi/c_type.pm | 23 +++++++++++++++----- 2 files changed, 52 insertions(+), 21 deletions(-) diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm index 3cd0ec1..c764576 100644 --- a/tools/winapi/c_function.pm +++ b/tools/winapi/c_function.pm @@ -20,7 +20,8 @@ package c_function; use strict; -sub new($) { +sub new($) +{ my $proto = shift; my $class = ref($proto) || $proto; my $self = {}; @@ -29,7 +30,13 @@ sub new($) { return $self; } -sub file($$) { + +# +# Property setter / getter functions (each does both) +# + +sub file($;$) +{ my $self = shift; my $file = \${$self->{FILE}}; @@ -40,7 +47,8 @@ sub file($$) { return $$file; } -sub begin_line($$) { +sub begin_line($;$) +{ my $self = shift; my $begin_line = \${$self->{BEGIN_LINE}}; @@ -51,7 +59,8 @@ sub begin_line($$) { return $$begin_line; } -sub begin_column($$) { +sub begin_column($;$) +{ my $self = shift; my $begin_column = \${$self->{BEGIN_COLUMN}}; @@ -62,7 +71,8 @@ sub begin_column($$) { return $$begin_column; } -sub end_line($$) { +sub end_line($;$) +{ my $self = shift; my $end_line = \${$self->{END_LINE}}; @@ -73,7 +83,8 @@ sub end_line($$) { return $$end_line; } -sub end_column($$) { +sub end_column($;$) +{ my $self = shift; my $end_column = \${$self->{END_COLUMN}}; @@ -84,7 +95,8 @@ sub end_column($$) { return $$end_column; } -sub linkage($$) { +sub linkage($;$) +{ my $self = shift; my $linkage = \${$self->{LINKAGE}}; @@ -95,7 +107,8 @@ sub linkage($$) { return $$linkage; } -sub return_type($$) { +sub return_type($;$) +{ my $self = shift; my $return_type = \${$self->{RETURN_TYPE}}; @@ -106,7 +119,8 @@ sub return_type($$) { return $$return_type; } -sub calling_convention($$) { +sub calling_convention($;$) +{ my $self = shift; my $calling_convention = \${$self->{CALLING_CONVENTION}}; @@ -117,7 +131,8 @@ sub calling_convention($$) { return $$calling_convention; } -sub name($$) { +sub name($;$) +{ my $self = shift; my $name = \${$self->{NAME}}; @@ -128,7 +143,8 @@ sub name($$) { return $$name; } -sub argument_types($$) { +sub argument_types($;$) +{ my $self = shift; my $argument_types = \${$self->{ARGUMENT_TYPES}}; @@ -139,7 +155,8 @@ sub argument_types($$) { return $$argument_types; } -sub argument_names($$) { +sub argument_names($;$) +{ my $self = shift; my $argument_names = \${$self->{ARGUMENT_NAMES}}; @@ -150,7 +167,8 @@ sub argument_names($$) { return $$argument_names; } -sub statements_line($$) { +sub statements_line($;$) +{ my $self = shift; my $statements_line = \${$self->{STATEMENTS_LINE}}; @@ -161,7 +179,8 @@ sub statements_line($$) { return $$statements_line; } -sub statements_column($$) { +sub statements_column($;$) +{ my $self = shift; my $statements_column = \${$self->{STATEMENTS_COLUMN}}; @@ -172,7 +191,8 @@ sub statements_column($$) { return $$statements_column; } -sub statements($$) { +sub statements($;$) +{ my $self = shift; my $statements = \${$self->{STATEMENTS}}; diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index f1ee7ba..0cf81bb 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -77,7 +77,13 @@ sub set_find_count_callback($$) { $$find_count = shift; } -sub kind($$) { + +# +# Property setter / getter functions (each does both) +# + +sub kind($;$) +{ my $self = shift; my $kind = \${$self->{KIND}}; my $dirty = \${$self->{DIRTY}}; @@ -93,7 +99,8 @@ sub kind($$) { return $$kind; } -sub _name($$) { +sub _name($;$) +{ my $self = shift; my $_name = \${$self->{_NAME}}; my $dirty = \${$self->{DIRTY}}; @@ -105,7 +112,8 @@ sub _name($$) { return $$_name; } -sub name($$) { +sub name($;$) +{ my $self = shift; my $name = \${$self->{NAME}}; my $dirty = \${$self->{DIRTY}}; @@ -124,7 +132,8 @@ sub name($$) { } } -sub pack($$) { +sub pack($;$) +{ my $self = shift; my $pack = \${$self->{PACK}}; my $dirty = \${$self->{DIRTY}}; @@ -187,7 +196,8 @@ sub field_count($) { return $count; } -sub field_names($$) { +sub field_names($;$) +{ my $self = shift; my $field_names = \${$self->{FIELD_NAMES}}; my $dirty = \${$self->{DIRTY}}; @@ -217,7 +227,8 @@ sub field_sizes($) { return $$field_sizes; } -sub field_type_names($$) { +sub field_type_names($;$) +{ my $self = shift; my $field_type_names = \${$self->{FIELD_TYPE_NAMES}}; my $dirty = \${$self->{DIRTY}};

1 0

Stefan Dösinger : wined3d: Add a more formal framework for driver quirks.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 7b7f0272219c97da68e8dd54adb0e225ff36e7f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7f0272219c97da68e8dd54a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 20:06:15 2009 +0200 wined3d: Add a more formal framework for driver quirks. This allows better defining of driver desc fixups without adding extra if lines for each card. For starters, there's a fixup for the advertised GLSL constants in ATI cards. fglrx advertises 512 GLSL uniforms instead of the supported 1024(means 128 instead of 256 vec4's). This bug was confirmed by ATI. --- dlls/wined3d/directx.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 6 ++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3b46965..260d579 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4002,10 +4002,39 @@ static const struct driver_version_information driver_version_table[] = { /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; +static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { + if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; + if(gl_info->gl_card == CARD_ATI_RADEON_9500) return TRUE; + if(gl_info->gl_card == CARD_ATI_RADEON_X700) return TRUE; + if(gl_info->gl_card == CARD_ATI_RADEON_X1600) return TRUE; + return FALSE; +} + +static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { + TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL\n", gl_info->vs_arb_constantsF); + gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; + TRACE_(d3d_caps)("Using ARB ps constant limit(=%u) for GLSL\n", gl_info->ps_arb_constantsF); + gl_info->ps_glsl_constantsF = gl_info->ps_arb_constantsF; +} + +struct driver_quirk quirk_table[] = { + { + match_ati_r300_to_500, + quirk_arb_constants, + "ATI GLSL constant quirk" + } +}; + static void fixup_extensions(WineD3D_GL_Info *gl_info) { unsigned int i; BOOL apple = implementation_is_apple(gl_info); + for(i = 0; i < (sizeof(quirk_table) / sizeof(*quirk_table)); i++) { + if(!quirk_table[i].match(gl_info)) continue; + TRACE_(d3d_caps)("Applying driver quirk \"%s\"\n", quirk_table[i].description); + quirk_table[i].apply(gl_info); + } + if(apple) { /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are * used it falls back to software. While the compiler can detect if the shader uses all declared diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index cc76035..2cf4e3f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3963,4 +3963,10 @@ typedef struct _WineD3D_GL_Info { } WineD3D_GL_Info; #undef USE_GL_FUNC +struct driver_quirk { + BOOL (*match)(WineD3D_GL_Info *gl_info); + void (*apply)(WineD3D_GL_Info *gl_info); + const char *description; +}; + #endif /* __WINE_WINED3D_GL */

1 0

Stefan Dösinger : wined3d: Move the generic mac glsl uniform fixup to the quirk table.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 50e91f8d84f847d7102587481f200a6c52f956fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e91f8d84f847d7102587481… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 20:13:11 2009 +0200 wined3d: Move the generic mac glsl uniform fixup to the quirk table. --- dlls/wined3d/directx.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 260d579..6d3531a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4010,6 +4010,10 @@ static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { return FALSE; } +static BOOL match_apple(WineD3D_GL_Info *gl_info) { + return implementation_is_apple(gl_info); +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL\n", gl_info->vs_arb_constantsF); gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; @@ -4022,6 +4026,18 @@ struct driver_quirk quirk_table[] = { match_ati_r300_to_500, quirk_arb_constants, "ATI GLSL constant quirk" + }, + /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are + * used it falls back to software. While the compiler can detect if the shader uses all declared + * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader + * using relative addressing falls back to software. + * + * ARB vp gives the correct amount of uniforms, so use it instead of GLSL + */ + { + match_apple, + quirk_arb_constants, + "Apple GLSL uniform override" } }; @@ -4036,21 +4052,6 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { } if(apple) { - /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are - * used it falls back to software. While the compiler can detect if the shader uses all declared - * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader - * using relative addressing falls back to software. - * - * ARB vp gives the correct amount of uniforms, so use it instead of GLSL - */ - if(gl_info->vs_glsl_constantsF <= gl_info->vs_arb_constantsF) { - FIXME("GLSL doesn't advertise more vertex shader uniforms than ARB. Driver fixup outdated?\n"); - } else { - TRACE("Driver claims %u GLSL vs uniforms, replacing with %u ARB vp uniforms\n", - gl_info->vs_glsl_constantsF, gl_info->vs_arb_constantsF); - gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; - } - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems * with fixed function fragment processing. Ideally this flag should be detected with a test shader * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones)

1 0

Stefan Dösinger : wined3d: Move the remaining quirks into the quirk table.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 78d26a659d14b050c90b1393580bc0d13b36e7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d26a659d14b050c90b13935… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 20:24:26 2009 +0200 wined3d: Move the remaining quirks into the quirk table. --- dlls/wined3d/directx.c | 159 ++++++++++++++++++++++++++++-------------------- 1 files changed, 93 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d3531a..e7a74d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4014,6 +4014,26 @@ static BOOL match_apple(WineD3D_GL_Info *gl_info) { return implementation_is_apple(gl_info); } +static BOOL match_geforce5(WineD3D_GL_Info *gl_info) { + if(gl_info->gl_vendor == VENDOR_NVIDIA) { + if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { + return TRUE; + } + } + return FALSE; +} + +static BOOL match_apple_intel(WineD3D_GL_Info *gl_info) { + return gl_info->gl_vendor == VENDOR_INTEL && implementation_is_apple(gl_info); +} + +static BOOL match_apple_nonr500ati(WineD3D_GL_Info *gl_info) { + if(!implementation_is_apple(gl_info)) return FALSE; + if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; + if(gl_info->gl_card == CARD_ATI_RADEON_X1600) return FALSE; + return TRUE; +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL\n", gl_info->vs_arb_constantsF); gl_info->vs_glsl_constantsF = gl_info->vs_arb_constantsF; @@ -4021,57 +4041,8 @@ static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = gl_info->ps_arb_constantsF; } -struct driver_quirk quirk_table[] = { - { - match_ati_r300_to_500, - quirk_arb_constants, - "ATI GLSL constant quirk" - }, - /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are - * used it falls back to software. While the compiler can detect if the shader uses all declared - * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader - * using relative addressing falls back to software. - * - * ARB vp gives the correct amount of uniforms, so use it instead of GLSL - */ - { - match_apple, - quirk_arb_constants, - "Apple GLSL uniform override" - } -}; - -static void fixup_extensions(WineD3D_GL_Info *gl_info) { - unsigned int i; - BOOL apple = implementation_is_apple(gl_info); - - for(i = 0; i < (sizeof(quirk_table) / sizeof(*quirk_table)); i++) { - if(!quirk_table[i].match(gl_info)) continue; - TRACE_(d3d_caps)("Applying driver quirk \"%s\"\n", quirk_table[i].description); - quirk_table[i].apply(gl_info); - } - - if(apple) { - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems - * with fixed function fragment processing. Ideally this flag should be detected with a test shader - * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones) - * do not like vertex shaders in feedback mode and return an error, even though it should be valid - * according to the spec. - * - * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This - * makes the shader slower and eats instruction slots which should be available to the d3d app. - * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist - * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If - * this workaround is activated on cards that do not need it, it won't break things, just affect - * performance negatively. - */ - if(gl_info->gl_vendor == VENDOR_INTEL || - (gl_info->gl_vendor == VENDOR_ATI && gl_info->gl_card != CARD_ATI_RADEON_X1600)) { - TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); - gl_info->set_texcoord_w = TRUE; - } - } +static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { + quirk_arb_constants(gl_info); /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). @@ -4085,16 +4056,12 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * has this extension promoted to core. The extension loading code sets this extension supported * due to that, so this code works on fglrx as well. */ - if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_info->gl_vendor == VENDOR_ATI) { - if(gl_info->gl_card == CARD_ATI_RADEON_X700 || gl_info->gl_card == CARD_ATI_RADEON_X1600 || - gl_info->gl_card == CARD_ATI_RADEON_9500 || gl_info->gl_card == CARD_ATI_RADEON_8500 || - gl_info->gl_card == CARD_ATI_RADEON_7200 || gl_info->gl_card == CARD_ATI_RAGE_128PRO) { - TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; - } - } + TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; +} +static void quirk_no_np2(WineD3D_GL_Info *gl_info) { /* The nVidia GeForceFX series reports OpenGL 2.0 capabilities with the latest drivers versions, but * doesn't explicitly advertise the ARB_tex_npot extension in the GL extension string. * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying @@ -4110,12 +4077,72 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * post-processing effects in the game "Max Payne 2"). * The behaviour can be verified through a simple test app attached in bugreport #14724. */ - if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && gl_info->gl_vendor == VENDOR_NVIDIA) { - if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { - TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; - } + TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing\n"); + gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; + gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; +} + +static void quirk_texcoord_w(WineD3D_GL_Info *gl_info) { + /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems + * with fixed function fragment processing. Ideally this flag should be detected with a test shader + * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones) + * do not like vertex shaders in feedback mode and return an error, even though it should be valid + * according to the spec. + * + * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This + * makes the shader slower and eats instruction slots which should be available to the d3d app. + * + * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist + * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If + * this workaround is activated on cards that do not need it, it won't break things, just affect + * performance negatively. + */ + TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); + gl_info->set_texcoord_w = TRUE; +} + +struct driver_quirk quirk_table[] = { + { + match_ati_r300_to_500, + quirk_ati_dx9, + "ATI GLSL constant and normalized texrect quirk" + }, + /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are + * used it falls back to software. While the compiler can detect if the shader uses all declared + * uniforms, the optimization fails if the shader uses relative addressing. So any GLSL shader + * using relative addressing falls back to software. + * + * ARB vp gives the correct amount of uniforms, so use it instead of GLSL + */ + { + match_apple, + quirk_arb_constants, + "Apple GLSL uniform override" + }, + { + match_geforce5, + quirk_no_np2, + "Geforce 5 NP2 disable" + }, + { + match_apple_intel, + quirk_texcoord_w, + "Init texcoord .w for Apple Intel GPU driver" + }, + { + match_apple_nonr500ati, + quirk_texcoord_w, + "Init texcoord .w for Apple ATI >= r600 GPU driver" + } +}; + +static void fixup_extensions(WineD3D_GL_Info *gl_info) { + unsigned int i; + + for(i = 0; i < (sizeof(quirk_table) / sizeof(*quirk_table)); i++) { + if(!quirk_table[i].match(gl_info)) continue; + TRACE_(d3d_caps)("Applying driver quirk \"%s\"\n", quirk_table[i].description); + quirk_table[i].apply(gl_info); } /* Find out if PBOs work as they are supposed to */

1 0

Stefan Dösinger : wined3d: Reserve additional GLSL constants on some drivers.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 39877a2ad2365c5ff28ab20d8aa428241d4d8217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39877a2ad2365c5ff28ab20d8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 20:33:15 2009 +0200 wined3d: Reserve additional GLSL constants on some drivers. Some drivers apparently need private constants, or don't have an efficient immval packing. For example, MacOS seems to need 1 float for each different relative addressing offset. fglrx has the same issue, although it is more efficient in general Previously this worked on most drivers because the 16 + 4 reserved int and bool constants kept the problem hidden. Now that we are more aggressive with uniforms we have to keep free room for some drivers. --- dlls/wined3d/directx.c | 18 +++++++++++++++++- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e7a74d4..50443e2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4041,6 +4041,16 @@ static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { gl_info->ps_glsl_constantsF = gl_info->ps_arb_constantsF; } +static void quirk_apple_glsl_constants(WineD3D_GL_Info *gl_info) { + quirk_arb_constants(gl_info); + /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. + * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should + * allow 48 different offsets or other helper immediate values + */ + TRACE_(d3d_caps)("Reserving 12 GLSL constants for compiler private use\n"); + gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); +} + static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { quirk_arb_constants(gl_info); @@ -4059,6 +4069,12 @@ static void quirk_ati_dx9(WineD3D_GL_Info *gl_info) { TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; gl_info->supported[WINE_NORMALIZED_TEXRECT] = TRUE; + + /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although + * it is generally more efficient. Reserve just 8 constants + */ + TRACE_(d3d_caps)("Reserving 8 GLSL constants for compiler private use\n"); + gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 8); } static void quirk_no_np2(WineD3D_GL_Info *gl_info) { @@ -4116,7 +4132,7 @@ struct driver_quirk quirk_table[] = { */ { match_apple, - quirk_arb_constants, + quirk_apple_glsl_constants, "Apple GLSL uniform override" }, { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2cf4e3f..763ed69 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3951,6 +3951,7 @@ typedef struct _WineD3D_GL_Info { BOOL arb_vs_offset_limit; BOOL set_texcoord_w; + DWORD reserved_glsl_constants; BOOL supported[OPENGL_SUPPORTED_EXT_END + 1];

1 0

Stefan Dösinger : wined3d: Merge match_apple and implementation_is_apple.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: de4f3dc8e864ac3fa927368305144a1dabb01eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4f3dc8e864ac3fa92736830… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 15 00:38:07 2009 +0200 wined3d: Merge match_apple and implementation_is_apple. --- dlls/wined3d/directx.c | 18 +++++++----------- dlls/wined3d/wined3d_gl.h | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50443e2..6a15a48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3850,7 +3850,7 @@ ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { return IUnknown_Release(volumeParent); } -static BOOL implementation_is_apple(const WineD3D_GL_Info *gl_info) +static BOOL match_apple(const WineD3D_GL_Info *gl_info) { /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to @@ -4002,7 +4002,7 @@ static const struct driver_version_information driver_version_table[] = { /* TODO: Add information about legacy ATI hardware, Intel and other cards */ }; -static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { +static BOOL match_ati_r300_to_500(const WineD3D_GL_Info *gl_info) { if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; if(gl_info->gl_card == CARD_ATI_RADEON_9500) return TRUE; if(gl_info->gl_card == CARD_ATI_RADEON_X700) return TRUE; @@ -4010,11 +4010,7 @@ static BOOL match_ati_r300_to_500(WineD3D_GL_Info *gl_info) { return FALSE; } -static BOOL match_apple(WineD3D_GL_Info *gl_info) { - return implementation_is_apple(gl_info); -} - -static BOOL match_geforce5(WineD3D_GL_Info *gl_info) { +static BOOL match_geforce5(const WineD3D_GL_Info *gl_info) { if(gl_info->gl_vendor == VENDOR_NVIDIA) { if(gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5800 || gl_info->gl_card == CARD_NVIDIA_GEFORCEFX_5600) { return TRUE; @@ -4023,12 +4019,12 @@ static BOOL match_geforce5(WineD3D_GL_Info *gl_info) { return FALSE; } -static BOOL match_apple_intel(WineD3D_GL_Info *gl_info) { - return gl_info->gl_vendor == VENDOR_INTEL && implementation_is_apple(gl_info); +static BOOL match_apple_intel(const WineD3D_GL_Info *gl_info) { + return gl_info->gl_vendor == VENDOR_INTEL && match_apple(gl_info); } -static BOOL match_apple_nonr500ati(WineD3D_GL_Info *gl_info) { - if(!implementation_is_apple(gl_info)) return FALSE; +static BOOL match_apple_nonr500ati(const WineD3D_GL_Info *gl_info) { + if(!match_apple(gl_info)) return FALSE; if(gl_info->gl_vendor != VENDOR_ATI) return FALSE; if(gl_info->gl_card == CARD_ATI_RADEON_X1600) return FALSE; return TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 763ed69..55c5855 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3965,7 +3965,7 @@ typedef struct _WineD3D_GL_Info { #undef USE_GL_FUNC struct driver_quirk { - BOOL (*match)(WineD3D_GL_Info *gl_info); + BOOL (*match)(const WineD3D_GL_Info *gl_info); void (*apply)(WineD3D_GL_Info *gl_info); const char *description; };

1 0