wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Alexandre Julliard : Rename the git-tools directory, we no longer have other tools.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: tools Branch: master Commit: 5fedd480cacc9534577b6c3013d2d9fd63e703c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=5fedd480cacc9534577b6c30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 16:55:45 2016 +0900 Rename the git-tools directory, we no longer have other tools. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wine_release | 2 +- winetest/winetest.cron | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wine_release b/wine_release index f28485d..aed1545 100755 --- a/wine_release +++ b/wine_release @@ -19,7 +19,7 @@ branch=${2:-master} website_dir="/home/winehq/opt/website" templates_dir=$website_dir/templates -tools_dir="/home/winehq/opt/git-tools" +tools_dir="/home/winehq/opt/tools" cd /home/winehq/opt/source diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 4349f26..42f52c8 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -17,7 +17,7 @@ # Cron job for generating winetest reports. Use it like # */5 * * * * apache winetest.cron -tools=/home/winehq/opt/git-tools/winetest +tools=/home/winehq/opt/tools/winetest workdir=/home/winehq/opt/winetest lock=/tmp/winetest.lock

1 0

Alexandre Julliard : Remove no longer used documentation scripts.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: tools Branch: master Commit: cf493350661fbd366a7e220779982668449c6fc3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cf493350661fbd366a7e2207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 14:12:27 2016 +0900 Remove no longer used documentation scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winedoc.css | 10 ------ winedocs.cron | 64 --------------------------------- winehtml.dsl | 27 -------------- wineprint.dsl | 111 ---------------------------------------------------------- 4 files changed, 212 deletions(-) diff --git a/winedoc.css b/winedoc.css deleted file mode 100644 index f93abba..0000000 --- a/winedoc.css +++ /dev/null @@ -1,10 +0,0 @@ -body { background-color: #FFFFFF; color: #000000; } - -a:link { color: #a50d0d; } -a:visited { color: #505050; } -a:active { color: #a50d0d; } - -.screen { background-color: #E0D0D0; padding: 0.5ex; } -.question { border-top: dashed thin; font-weight: bolder; } - -.userinput { font-weight: bold; } diff --git a/winedocs.cron b/winedocs.cron deleted file mode 100755 index 472a087..0000000 --- a/winedocs.cron +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# This script updates the documentation on the website if necessary. -# It should be run periodically from cron. -# - -set -e -umask 002 - -cd /home/winehq/opt/wine-docs -git fetch >/dev/null 2>&1 - -# check if anything has changed -if [ "$(git rev-parse HEAD)" = "$(git rev-parse origin/master)" ] -then - exit 0 # nothing to do -fi - -rm -f lastbuild.log -exec >lastbuild.log 2>&1 - -git reset --hard origin/master - -echo "==== BUILDING SGML DOCUMENTATION ====" - -books="wineusr-guide winedev-guide winelib-guide" -langs="en" -site_base_dir="/home/winehq/opt/website" -tools_dir="/home/winehq/opt/git-tools" -git_dir="/home/winehq/opt/source/git" -guides_base_dir="$site_base_dir/docs" -winehq_base_dir="$site_base_dir/templates" - -for lang in $langs -do - [ -d $guides_base_dir/$lang ] || mkdir $guides_base_dir/$lang - [ -d $winehq_base_dir/$lang/docs ] || mkdir $winehq_base_dir/$lang/docs - rm -f $guides_base_dir/$lang/winedoc.css && cp $tools_dir/winedoc.css $guides_base_dir/$lang - - cd $lang - for book in $books - do - echo "* $book" - - # build guides as single files - docbook2html -u -d $tools_dir/winehtml.dsl $book.sgml - docbook2pdf -d $tools_dir/wineprint.dsl $book.sgml - docbook2ps -d $tools_dir/wineprint.dsl $book.sgml - mv -f $book.html $book.pdf $book.ps $guides_base_dir/$lang - - # build the online html version - docbook2html -d $tools_dir/winehtml.dsl -o $book.web $book.sgml - [ -d $winehq_base_dir/$lang/docs/$book ] || mkdir $winehq_base_dir/$lang/docs/$book - for f in $book.web/*.htm - do - outfile=`basename $f .htm`.template - $tools_dir/html2template -i $f -o $outfile && mv -f $outfile $winehq_base_dir/$lang/docs/$book/$outfile - done - rm -rf $book.web - done - cd .. -done - -# end diff --git a/winehtml.dsl b/winehtml.dsl deleted file mode 100644 index 5270a99..0000000 --- a/winehtml.dsl +++ /dev/null @@ -1,27 +0,0 @@ -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY walsh-style PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL> -<!ENTITY cygnus-style SYSTEM "/usr/lib/sgml/stylesheet/dsssl/docbook/cygnus/cygnus-both.dsl" CDATA DSSSL> -]> - -<style-sheet> -<style-specification id="html" use="docbook"> -<style-specification-body> - -; Use the section id as the filename rather than -; cryptic filenames like x1547.html -(define %use-id-as-filename% #t) - -; Repeat the section number in each section to make it easier -; when browsing the doc -(define %section-autolabel% #t) - -; Use CSS to make the look of the documentation customizable -(define %stylesheet% "winedoc.css") -(define %stylesheet-type% "text/css") - -</style-specification-body> -</style-specification> - -<external-specification id="docbook" document="walsh-style"> - -</style-sheet> diff --git a/wineprint.dsl b/wineprint.dsl deleted file mode 100644 index 7f53b2f..0000000 --- a/wineprint.dsl +++ /dev/null @@ -1,111 +0,0 @@ -<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ -<!ENTITY print-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL> -]> - -<style-sheet> - -<style-specification id="print" use="print-stylesheet"> -<style-specification-body> - -;; I was hoping that this would take out the many blank pages in the -;; PDF file, but it doesn't, it just slides the page numbers over. -(define %two-side% #f) - -(define %generate-book-titlepage% #t) - -;;Titlepage Not Separate -(define (chunk-skip-first-element-list) - (list (normalize "sect1") - (normalize "section"))) - -;;Titlepage Separate? -;(define (chunk-skip-first-element-list) -; '()) - -(define (list-element-list) - ;; fixes bug in Table of Contents generation - '()) - -(define (toc-depth nd) - 2) - -;; This seems to have no affect -(define %generate-book-titlepage-on-separate-page% #f) - -(define %body-start-indent% - ;; Default indent of body text - 2pi) - -(define %para-indent-firstpara% - ;; First line start-indent for the first paragraph - 0pt) - -(define %para-indent% - ;; First line start-indent for paragraphs (other than the first) - 0pt) - -(define %block-start-indent% - ;; Extra start-indent for block-elements - 2pt) - -;;Define distance between paragraphs -(define %para-sep% - (/ %bf-size% 2.0)) - -;;Define distance between block elements (figures, tables, etc.). -(define %block-sep% - (* %para-sep% 1.0)) -;; (* %para-sep% 2.0)) - -(define %hyphenation% - ;; Allow automatic hyphenation? - #t) - -(define %left-margin% 5pi) -(define %right-margin% 5pi) -(define %top-margin% 5pi) -(define %bottom-margin% 5pi) - -(define %footer-margin% 2pi) -(define %header-margin% 2pi) - -(define %line-spacing-factor% 1.3) - ;; Factor used to calculate leading - ;; The leading is calculated by multiplying the current font size by the - ;; '%line-spacing-factor%'. For example, if the font size is 10pt and - ;; the '%line-spacing-factor%' is 1.1, then the text will be - ;; printed "10-on-11". - -(define %head-before-factor% - ;; Factor used to calculate space above a title - ;; The space before a title is calculated by multiplying the font size - ;; used in the title by the '%head-before-factor%'. -;; 0.75) - 0.5) - -(define %head-after-factor% - ;; Factor used to calculate space below a title - ;; The space after a title is calculated by multiplying the font size used - ;; in the title by the '%head-after-factor%'. - 0.5) - -(define %input-whitespace-treatment% 'collapse) - -(define ($generate-book-lot-list$) - ;; Which Lists of Titles should be produced for Books? - (list )) - -(define tex-backend - ;; Are we using the TeX backend? - ;; This parameter exists so that '-V tex-backend' can be used on the - ;; command line to explicitly select the TeX backend. - #t) - -</style-specification-body> -</style-specification> - -<external-specification id="print-stylesheet" document="print-ss"> - -</style-sheet> - -

1 0

Alexandre Julliard : winetest: Use mingw-w64 to build the test binaries.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: tools Branch: master Commit: bca53766e20e0dd4689559f6ab5a62c3277aff12 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bca53766e20e0dd4689559f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 14:57:14 2016 +0900 winetest: Use mingw-w64 to build the test binaries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/make-winetest | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 0ae85fe..638590b 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -47,11 +47,11 @@ done destdir="/home/winehq/opt/winetest/builds" desturl="http://test.winehq.org/builds" servicedir="/home/winehq/opt/winetest/winehq-builds/winetest" -toolsdir="/home/winehq/opt/git-tools" +toolsdir="/home/winehq/opt/tools" transldir="/home/winehq/opt/source/transl" -mingw32=i586-mingw32msvc -mingw64=x86_64-pc-mingw32 +mingw32=i686-w64-mingw32 +mingw64=x86_64-w64-mingw32 logfile=LOG # if the log file exists, either a build is in progress or one has failed @@ -101,20 +101,20 @@ umask 022 # then cross-compile the tests - test -d build-mingw || - (mkdir build-mingw && - cd build-mingw && + test -d build-mingw32 || + (mkdir build-mingw32 && + cd build-mingw32 && ../wine/configure --host=$mingw32 --with-wine-tools=../build-native --without-x --without-freetype) || exit - (cd build-mingw && + (cd build-mingw32 && make depend && make programs/winetest && upx -9 -qq programs/winetest/winetest.exe) || exit # install everything - chmod 644 build-mingw/programs/winetest/winetest.exe - mv -f build-mingw/programs/winetest/winetest.exe $destdir/winetest-$head.exe + chmod 644 build-mingw32/programs/winetest/winetest.exe + mv -f build-mingw32/programs/winetest/winetest.exe $destdir/winetest-$head.exe ln -sf winetest-$head.exe $destdir/winetest-latest.exe rm -f $servicedir/*.cookie $servicedir/*.url sha1sum $destdir/winetest-latest.exe | cut -c1-40 > $servicedir/winetest-$head.cookie

1 0

Alexandre Julliard : winetest: Generate a page showing the test report processing errors.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: tools Branch: master Commit: c0a56077d23f9f66f39be2f05911537b1fbcc0bd URL: http://source.winehq.org/git/tools.git/?a=commit;h=c0a56077d23f9f66f39be2f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 18 13:13:44 2016 +0900 winetest: Generate a page showing the test report processing errors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index cacd05f..5f00f5d 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -23,8 +23,9 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); +use POSIX qw(strftime); -use vars qw/$gitdir $gitweb/; +use vars qw/$gitdir $gitweb $queuedir/; require "winetest.conf"; binmode STDIN, ':utf8'; @@ -193,9 +194,7 @@ EOF next unless defined $alltests{$test}->{$build->{name}}; printf OUT " <tr><td class=\"build\"><a href=\"../%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d %s %04d</td>", - $date[3], $months[$date[4]], $date[5] + 1900, $date[2]; + printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); foreach my $group (@groups) { next unless defined $used_group{$group->{name}}; @@ -243,8 +242,7 @@ print OUT "<th colspan=\"3\">Failures</th><th></th></tr></thead>\n"; foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - my @date = gmtime($build->{date}); - printf OUT " <td class=\"date\">%02d %s</td>", $date[3], $months[$date[4]]; + printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) { @@ -299,4 +297,40 @@ EOF close OUT; rename "data/index.html.new", "data/index.html" or unlink "data/index.html.new"; + +# generate a table of the errors encountered during processing + +my @errors; + +opendir DIR, $queuedir or die "cannot open $queuedir"; +foreach my $dir (readdir DIR) +{ + next unless $dir =~ /^err.....$/; + open ERR, "$queuedir/$dir/error" or next; + my $msg = <ERR>; + chomp $msg; + my $date = (stat ERR)[9]; + close ERR; + push @errors, { msg => $msg, date => $date, url => "../queue/$dir/report" }; +} +closedir DIR; + +open OUT, ">data/errors.html.new" or die "cannot create data/errors.html.new"; + +print OUT start_html( -title => "Errors caught during Wine test report processing", + -style => {src => "/summary.css"}, + -encoding => "utf-8" ); +print OUT "<div class=\"main\"><h2>Errors caught during Wine test report processing</h2>\n"; +print OUT "<table class=\"report\"><thead><tr><th class=\"date\">Date</th><th class=\"commitlink\">Error</th></thread>\n"; + +foreach my $err (sort { $b->{date} <=> $a->{date}; } @errors) +{ + printf OUT "<tr><td class=\"date\">%s</td>\n", strftime("%b %d %H:%M:%S", gmtime($err->{date})); + printf OUT "<td class=\"commitlink\"><a href=\"%s\">%s</a></td></tr>\n", $err->{url}, escapeHTML($err->{msg}); +} +print OUT "</table>", end_html(); +close OUT; + +rename "data/errors.html.new", "data/errors.html" or unlink "data/errors.html.new"; + exit 0;

1 0

Alexandre Julliard : winetest: Add the report tag to the error message on parsing errors.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: tools Branch: master Commit: 88a3af5aa052475067a37cf2bc6cbc67b963223b URL: http://source.winehq.org/git/tools.git/?a=commit;h=88a3af5aa052475067a37cf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 23:55:08 2016 +0900 winetest: Add the report tag to the error message on parsing errors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 62cd997..2f2faa1 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -55,7 +55,7 @@ use Errno qw/ENOTEMPTY/; $ENV{GIT_DIR} = $gitdir; -my ($report, $tmpdir); +my ($report, $tmpdir, $tag); sub mydie(@) { my $errdir = tempdir ("errXXXXX", DIR => $queuedir); @@ -63,12 +63,13 @@ sub mydie(@) { print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; exit 3; } + my $label = substr($tag,1) || "???"; if (open ERR, ">$errdir/error") { - print ERR "$name0:error:$errdir: ", @_; + print ERR "$label: ", @_; close ERR; } - print STDERR "$name0:error:$errdir: ", @_; + print STDERR "$name0:error:$label: ", @_; exit 1; } @@ -112,7 +113,7 @@ $_ = <IN>; if (/^Archive: /) { $_ = <IN>; } # ignore Archive header /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $_"; -my $tag = $1 eq ""?"":"_$1"; +$tag = $1 eq ""?"":"_$1"; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_";

1 0

Alexandre Julliard : winetest: Use end_form() instead of endform() for newer CGI.pm version.
by Alexandre Julliard 18 Mar '16

18 Mar '16

Module: tools Branch: master Commit: d4304df8e59bcc2a0774fe2c9423a31f6ffdb66e URL: http://source.winehq.org/git/tools.git/?a=commit;h=d4304df8e59bcc2a0774fe2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 17 20:51:32 2016 +0900 winetest: Use end_form() instead of endform() for newer CGI.pm version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi index 2daf5cc..98a5260 100755 --- a/winetest/winetest.cgi +++ b/winetest/winetest.cgi @@ -86,7 +86,7 @@ print header, filefield ("reportfile","c:\\temp\\res",45), p, reset, submit ("submit","Upload File"), - endform, + end_form(), hr; if ($error) {

1 0

Józef Kucia : wined3d: Use GLuint instead of GLenum to store ARB blitter shaders.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 966a07149a029191d3d9ba010e5bcb8ccb8114a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966a07149a029191d3d9ba010… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:15 2016 +0100 wined3d: Use GLuint instead of GLenum to store ARB blitter shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 189a516..99c21db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6939,7 +6939,7 @@ struct arbfp_blit_type struct arbfp_blit_desc { - GLenum shader; + GLuint shader; struct arbfp_blit_type type; struct wine_rb_entry entry; }; @@ -7393,7 +7393,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; const char *tex_target = arbfp_texture_target(type->res_type); @@ -7482,7 +7482,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; char luminance_component; @@ -7607,7 +7607,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; const char *tex_target = arbfp_texture_target(type->res_type); @@ -7661,7 +7661,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) { - GLenum shader; + GLuint shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; const struct wined3d_texture *texture = surface->container; struct arbfp_blit_priv *priv = blit_priv;

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rty_fine opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 4b926f91b41a54255bc263ac0a2368890b1b96f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b926f91b41a54255bc263ac0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:14 2016 +0100 wined3d: Recognize SM5 deriv_rty_fine opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f14caaa..189a516 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5256,6 +5256,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_DSY_COARSE */ NULL, + /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_ENDIF */ shader_hw_endif, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a063071..8664172 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8098,6 +8098,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ NULL, + /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index eb57171..59103b6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -84,6 +84,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DSX_FINE */ "deriv_rtx_fine", /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", + /* WINED3DSIH_DSY_FINE */ "deriv_rty_fine", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_ENDIF */ "endif", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5f12c55..86c5b1b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -186,6 +186,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, + WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -391,6 +392,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "F", "F"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "F", "F"}, + {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30254ab..34ea6cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -536,6 +536,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSX_FINE, WINED3DSIH_DSY, WINED3DSIH_DSY_COARSE, + WINED3DSIH_DSY_FINE, WINED3DSIH_ELSE, WINED3DSIH_EMIT, WINED3DSIH_ENDIF,

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rtx_fine opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 7fccd3bd1361268b2ec5862b4a367ef49d68dfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fccd3bd1361268b2ec5862b4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:13 2016 +0100 wined3d: Recognize SM5 deriv_rtx_fine opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 923c7bd..f14caaa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5253,6 +5253,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DST */ shader_hw_map2gl, /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, + /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2879b44..a063071 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8095,6 +8095,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, + /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5ef39ff..eb57171 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DST */ "dst", /* WINED3DSIH_DSX */ "dsx", /* WINED3DSIH_DSX_COARSE */ "deriv_rtx_coarse", + /* WINED3DSIH_DSX_FINE */ "deriv_rtx_fine", /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", /* WINED3DSIH_ELSE */ "else", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 65bcfa4..5f12c55 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -184,6 +184,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, + WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -388,6 +389,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, + {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "F", "F"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cfb480..30254ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -533,6 +533,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DST, WINED3DSIH_DSX, WINED3DSIH_DSX_COARSE, + WINED3DSIH_DSX_FINE, WINED3DSIH_DSY, WINED3DSIH_DSY_COARSE, WINED3DSIH_ELSE,

1 0

Józef Kucia : wined3d: Recognize SM5 deriv_rty_coarse opcode.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 9108fe72335baa63555e1999b105c3cfe713a7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9108fe72335baa63555e1999b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:12 2016 +0100 wined3d: Recognize SM5 deriv_rty_coarse opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4885065..923c7bd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5254,6 +5254,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, /* WINED3DSIH_DSY */ shader_hw_dsy, + /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_ENDIF */ shader_hw_endif, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c915470..2879b44 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8096,6 +8096,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSX_COARSE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, + /* WINED3DSIH_DSY_COARSE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_ENDIF */ shader_glsl_end, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c946640..5ef39ff 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -82,6 +82,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DSX */ "dsx", /* WINED3DSIH_DSX_COARSE */ "deriv_rtx_coarse", /* WINED3DSIH_DSY */ "dsy", + /* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_ENDIF */ "endif", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index aaacd44..65bcfa4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -184,6 +184,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, + WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -387,6 +388,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "F", "F"}, + {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "F", "F"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "U", "UUR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb69b6b..3cfb480 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -534,6 +534,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSX, WINED3DSIH_DSX_COARSE, WINED3DSIH_DSY, + WINED3DSIH_DSY_COARSE, WINED3DSIH_ELSE, WINED3DSIH_EMIT, WINED3DSIH_ENDIF,

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
73
Older →

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 March 2016