March 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Downgrade unknown DWORD FIXMEs() to WARN() messages.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 0f5c6c7b79a7e63d87e3b6b5844d79a734aec891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5c6c7b79a7e63d87e3b6b58… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:44 2017 +0100 d3d11: Downgrade unknown DWORD FIXMEs() to WARN() messages. 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/d3d11/shader.c | 2 +- dlls/d3d11/utils.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index ae19eba..547181e 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -183,7 +183,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d read_dword(&ptr, &count); TRACE("%u elements\n", count); - skip_dword_unknown(&ptr, 1); + skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */ if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) { diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 89dbbda..bd2c840 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -727,11 +727,11 @@ void skip_dword_unknown(const char **ptr, unsigned int count) unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); + WARN("\t0x%08x\n", d); } } @@ -754,10 +754,10 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, return E_INVALIDARG; } - /* checksum? */ + WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); + skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Józef Kucia : wined3d: Load core GL transform feedback functions.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 4a8a7a09f650d3f02ebfa0cb8fa29f97fc96c539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8a7a09f650d3f02ebfa0cb8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:45 2017 +0100 wined3d: Load core GL transform feedback functions. 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/directx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 53255de..9a67794 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3161,6 +3161,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */ USE_GL_FUNC(glAttachShader) /* OpenGL 2.0 */ USE_GL_FUNC(glBeginQuery) /* OpenGL 1.5 */ + USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */ USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */ USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ @@ -3195,6 +3196,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */ USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */ + USE_GL_FUNC(glEndTransformFeedback) /* OpenGL 3.0 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ USE_GL_FUNC(glGenQueries) /* OpenGL 1.5 */ USE_GL_FUNC(glGenVertexArrays) /* OpenGL 3.0 */ @@ -3228,6 +3230,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */ USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */ USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */ + USE_GL_FUNC(glTransformFeedbackVaryings)/* OpenGL 3.0 */ USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */ USE_GL_FUNC(glUniform1fv) /* OpenGL 2.0 */ USE_GL_FUNC(glUniform1i) /* OpenGL 2.0 */

1 0

Józef Kucia : wined3d: Handle stream output buffer bind flag.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 3d459c6152f2364ef28e2e7b505f20270c880b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d459c6152f2364ef28e2e7b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:46 2017 +0100 wined3d: Handle stream output buffer bind flag. 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/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c584147..3c6bc61 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1360,6 +1360,9 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) return GL_UNIFORM_BUFFER; + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + return GL_TRANSFORM_FEEDBACK_BUFFER; + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) FIXME("Unhandled bind flags %#x.\n", bind_flags);

1 0

Józef Kucia : wined3d: Generate geometry shader outputs when NULL pixel shader is used.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 1a1b3fd3bcd5b2b9cc8ad182204025af21dccba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a1b3fd3bcd5b2b9cc8ad1822… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 23 12:15:47 2017 +0100 wined3d: Generate geometry shader outputs when NULL pixel shader is used. In preparation for stream output. 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/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3385d83..004d490 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7063,7 +7063,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->ps_input_count, gl_info); + shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->output_count, gl_info); shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) return 0; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 011aee4..2c9976d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3407,8 +3407,8 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 void find_gs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct gs_compile_args *args) { - args->ps_input_count = state->shader[WINED3D_SHADER_TYPE_PIXEL] - ? state->shader[WINED3D_SHADER_TYPE_PIXEL]->limits->packed_input : 0; + args->output_count = state->shader[WINED3D_SHADER_TYPE_PIXEL] + ? state->shader[WINED3D_SHADER_TYPE_PIXEL]->limits->packed_input : shader->limits->packed_output; } void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21c5f1b..b58da36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1312,7 +1312,7 @@ struct vs_compile_args struct gs_compile_args { - unsigned int ps_input_count; + unsigned int output_count; }; struct wined3d_context;

1 0

Francois Gouget : winetest/build-index: Use a relative link to the rejected reports page.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: 0fe6c628563604f2576944b43af0af780cbb3271 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0fe6c628563604f2576944b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:48:25 2017 +0100 winetest/build-index: Use a relative link to the rejected reports page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index e811b62..1f0b2f5 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -328,7 +328,7 @@ print OUT <<"EOF"; <div class="navbar"> To run the tests on your Windows machine, download the <a href="/builds/winetest-latest.exe">latest winetest.exe</a> build. If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>.<br> -If you don't see your results, check the <a href="/data/errors.html">rejected reports</a> list. +If you don't see your results, check the <a href="errors.html">rejected reports</a> list. </div> </body></html> EOF

1 0

Francois Gouget : winetest/gather: In case of error keep the old summary and totals files.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: 7860f80df8cdd7a92a3592ffff9d71e4ec75f414 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7860f80df8cdd7a92a3592ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:58:08 2017 +0100 winetest/gather: In case of error keep the old summary and totals files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index a24f06e..9680fbb 100755 --- a/winetest/gather +++ b/winetest/gather @@ -622,7 +622,7 @@ sub build_totals($) printf TOTAL "%s %u %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos}, $report->{successes}; } close TOTAL; - rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt"; + rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt.new"; } sub output_table($) @@ -749,7 +749,7 @@ foreach my $group (@groups) { output_table(undef); close SUMMARY; -rename "$datadir/$build/summary.txt.new", "$datadir/$build/summary.txt" or unlink "$datadir/$build/summary.txt"; +rename "$datadir/$build/summary.txt.new", "$datadir/$build/summary.txt" or unlink "$datadir/$build/summary.txt.new"; build_totals(\@groups);

1 0

Francois Gouget : winetest/gather: Remove some old format compatibility code.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: cb1c6fda2f6ac6919eee398021b81f0d1b42a776 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cb1c6fda2f6ac6919eee3980… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:54:54 2017 +0100 winetest/gather: Remove some old format compatibility code. We no longer generate dllinfo.html files for the reports. Now all platform information is in the version.html file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/winetest/gather b/winetest/gather index 275ad0d..a24f06e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -370,19 +370,10 @@ sub build_header_footer($) my $group = $report->{group}; if (!defined $msg) { - if (-r "$datadir/$build/$report->{dir}/dllinfo.html") { - $msg = <<"EOF"; - $group->{name}<br><small> - <a href=\"$report->{dir}/version.html\">$report->{tag}</a><br> - <a href=\"$report->{dir}/dllinfo.html\">[info]</a> - <a href=\"$report->{dir}/report.html\">[file]</a></small> -EOF - } else { - $msg = <<"EOF"; + $msg = <<"EOF"; $group->{name}<br><small> <a href=\"$report->{dir}/version.html\">$report->{tag}</a></small> EOF - } chop $msg; } $title .= <<"EOF";

1 0

Francois Gouget : winetest/build-index: Stdin and stdout don' t need UTF-8 mode.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: 09a70af3a66c75e5e896ecb8880b4df357129f92 URL: http://source.winehq.org/git/tools.git/?a=commit;h=09a70af3a66c75e5e896ecb8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:55:16 2017 +0100 winetest/build-index: Stdin and stdout don't need UTF-8 mode. Nothing is read from or written to them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 1f0b2f5..33cc9a5 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -37,8 +37,6 @@ sub BEGIN use vars qw/$gitdir $gitweb $queuedir/; require "winetest.conf"; -binmode STDIN, ':utf8'; -binmode STDOUT, ':utf8'; $ENV{GIT_DIR} = $gitdir;

1 0

Francois Gouget : winetest/build-index: Remove an unused variable.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: 33da13a13141b9a61f1f9aae71d6ff26ef839349 URL: http://source.winehq.org/git/tools.git/?a=commit;h=33da13a13141b9a61f1f9aae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 12:59:25 2017 +0100 winetest/build-index: Remove an unused variable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 2 -- 1 file changed, 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 33cc9a5..c4fa2ed 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -100,8 +100,6 @@ my %wine = (name => "Wine"); my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); -my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); - # read the test data dir my @builds;

1 0

Francois Gouget : winetest/dissect: Simplify handling of $tag.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: tools Branch: master Commit: d65ea7e95403fba612221870fde114fc3c1ae14f URL: http://source.winehq.org/git/tools.git/?a=commit;h=d65ea7e95403fba612221870… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 23 13:02:10 2017 +0100 winetest/dissect: Simplify handling of $tag. We don't want the leading underscore except in one place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index c2c453c..c6b4b71 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -73,7 +73,7 @@ sub mydie(@) { print STDERR "$name0:error: unable to rename '$tmpdir' to '$errdir': $!\n"; exit 3; } - my $label = $tag ? substr($tag, 1) : "<notag>"; + my $label = $tag ? $tag : "<notag>"; if (open ERR, ">$errdir/error") { print ERR "$label: ", @_; @@ -123,15 +123,15 @@ $_ = <IN>; if (/^Archive: /) { $_ = <IN>; } # ignore Archive header /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $_"; -$tag = $1 eq ""?"":"_$1"; +$tag = $1; $_ = <IN>; /^Build info:\r?$/ or mydie "no Build info header: $_"; -my $box = create_box( "version", "version", sprintf "Version information for %s", substr($tag,1) ); +my $box = create_box( "version", "version", "Version information for $tag" ); $box->{data} .= "<h2>Build version</h2>\n"; $box->{data} .= "<table class=\"output\">\n"; $box->{data} .= sprintf "<tr><td>Build</td><td><a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></td></tr>\n", $testbuild, $testbuild, $shortbuild; -$box->{data} .= sprintf "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">%s</a></td></tr></table>\n", substr($tag,1); +$box->{data} .= "<tr><td>Tag</td><td><a title=\"Full report\" href=\"report.html\">$tag</a></td></tr></table>\n"; $box->{data} .= sprintf "<div class=\"output\"> </div>\n"; while (($_ = <IN>) =~ s/^ //) { @@ -464,7 +464,7 @@ foreach ($datadir, $builddir) { } my ($dir, $dirbase, $try); -$dir = $dirbase = "$builddir/$version$tag"; +$dir = $dirbase = "$builddir/${version}_$tag"; $try = 0; while (!rename $tmpdir, $dir) { $!{ENOTEMPTY} or mydie "unable to rename '$tmpdir' to '$dir': $!\n";

1 0