wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Jacek Caban : mshtml: Use event target vtbl to construct target chain in fire_event_obj.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 57b830526b68c28cba9792e2c489bee45680ad87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b830526b68c28cba9792e2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 19 17:01:33 2017 +0200 mshtml: Use event target vtbl to construct target chain in fire_event_obj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 10 ++++ dlls/mshtml/htmlelem.c | 24 +++++++++- dlls/mshtml/htmlevent.c | 119 +++++++++++++++++++---------------------------- dlls/mshtml/htmlevent.h | 3 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 ++-- dlls/mshtml/persist.c | 4 +- dlls/mshtml/script.c | 4 +- 9 files changed, 94 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57b830526b68c28cba979…

1 0

Alexandre Julliard : buildimage: Convert the XML parser to use XML:: LibXML.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 9e0c990be1838c5a1402babbb96d0f6cc592b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0c990be1838c5a1402babbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 19 16:51:39 2017 +0200 buildimage: Convert the XML parser to use XML::LibXML. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/buildimage | 168 ++++++++++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 95 deletions(-) diff --git a/tools/buildimage b/tools/buildimage index 74519fd..7075bc9 100755 --- a/tools/buildimage +++ b/tools/buildimage @@ -20,7 +20,7 @@ use strict; use warnings; -use XML::Parser; +use XML::LibXML; use MIME::Base64; use File::Copy; @@ -58,6 +58,13 @@ $SIG{"HUP"} = "cleanup"; $SIG{"TERM"} = "cleanup"; $SIG{"__DIE__"} = "cleanup"; +my %label = +( + 'ico' => 'icon:(\d*)-(\d*)', + 'cur' => 'cursor:(\d*)-(\d*)', + 'bmp' => 'bitmap:(\d*)-(\d*)', +); + # run a shell command and die on error sub shell(@) { @@ -65,120 +72,91 @@ sub shell(@) system(@args) == 0 or die "@args failed: $?"; } -sub svg_element_start +# add an image to the icon/cursor +sub add_image($$) { - my($expat, $element, %attr) = @_; + my ($file, $size) = @_; + + if (defined $hotspot[$size]) + { + my @coords = @{$hotspot[$size]}; + push @icotool_args, "--hotspot-x=$coords[0]", "--hotspot-y=$coords[1]"; + } + push @icotool_args, $size >= 128 ? "--raw=$file" : $file; + push @pngFiles, $file; +} - # Parse the id for icon/bitmap render directives - my $id = $attr{'id'}; - return unless defined($id); +# Render the SVG image +my @rsvgCmd; +push(@rsvgCmd, $rsvg); +push(@rsvgCmd, $svgFileName); +push(@rsvgCmd, "-o") if ($rsvg eq "rsvg-convert"); +push(@rsvgCmd, $renderedSVGFileName); +shell @rsvgCmd; - my $size = 0; - my $depth = 0; - my $width = 0; - my $height = 0; +# Render the images in the SVG +my $xml = XML::LibXML->load_xml( location => $svgFileName ); +my $xc = XML::LibXML::XPathContext->new($xml); +$xc->registerNs('x', 'http://www.w3.org/2000/svg'); - if ($id =~ /hotspot:(\d*)/) +if ($ext eq "bmp") +{ + foreach my $element ($xc->findnodes("/x:svg")) { - $hotspot[$1] = [ $attr{x}, $attr{y} ]; - return; + next unless $element->{id} =~ /bitmap:(\d*)-(\d*)/; + my $size = $1; + my $depth = $2; + if ($depth == 24) { + shell $convert, $renderedSVGFileName, "+matte", $outFileName; + } else { + shell $convert, $renderedSVGFileName, $outFileName; + } + cleanup(); + exit(0); } +} - if($ext eq "ico") { - return unless $id =~ /icon:(\d*)-(\d*)/; - $size = $1; - $depth = $2; - } elsif($ext eq "cur") { - return unless $id =~ /cursor:(\d*)-(\d*)/; - $size = $1; - $depth = $2; - } elsif($ext eq "bmp") { - return unless $id =~ /bitmap:(\d*)-(\d*)/; - $size = $1; - $depth = $2; +# fetch hotspot rectangles for the various sizes + +if ($ext eq "cur") +{ + foreach my $element ($xc->findnodes("/x:svg/x:rect")) + { + next unless $element->{id} =~ /hotspot:(\d*)/; + $hotspot[$1] = [ $element->{x}, $element->{y} ]; } +} - return unless defined($size) and defined($depth); +# extract rectangles from the rendered svg +foreach my $element ($xc->findnodes("/x:svg/*[\@id]")) +{ + next unless $element->{id} =~ /$label{$ext}/; + my $size = $1; + my $depth = $2; warn "Unexpected depth" unless $depth == 1 or $depth == 4 or $depth == 8 or $depth == 24 or $depth == 32; - my $pngFileName = "$outName-$size-$depth.png"; - - if($element eq "svg") { - - if ($ext eq "bmp") { - if ($depth == 24) { - shell $convert, $renderedSVGFileName, "+matte", $outFileName; - } else { - shell $convert, $renderedSVGFileName, $outFileName; - } - cleanup(); - exit(0); - } + my $file = "$outName-$size-$depth.png"; - # The whole file is tagged - $pngFileName = $renderedSVGFileName; - - } elsif($element eq "rect") { - - # Extract SVG vector images - my $x = $attr{'x'}; - my $y = $attr{'y'}; - $width = $attr{'width'}; - $height = $attr{'height'}; - - if(defined($x) and defined($y)) { - if($x =~ /\d*/ and $y =~ /\d*/) { - shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", "-depth", $depth, $pngFileName; - } - } - } elsif($element eq "image" ) { - - # Extract Base64 encoded PNG data to files - my $xlinkHref = $attr{'xlink:href'}; - if(defined($xlinkHref)) { - $xlinkHref =~ /data:image\/png;base64(.*)/; - my $imageEncodedData = $1; - if(defined $imageEncodedData) { - open(FILE, '>' . $pngFileName) or die "$!"; - print FILE decode_base64($imageEncodedData); - close FILE; - } - } - } else { - return; - } - - if (defined $hotspot[$size]) + my $x = $element->{x}; + my $y = $element->{y}; + my $width = $element->{width}; + my $height = $element->{height}; + if ($element->{'xlink:href'}) { - my @coords = @{$hotspot[$size]}; - push @icotool_args, "--hotspot-x=$coords[0]", "--hotspot-y=$coords[1]"; - } - - if ($width >= 128 && $height >= 128) - { - push @icotool_args, "--raw=$pngFileName"; + # extract base64-encoded png image + (my $data = $element->{'xlink:href'}) =~ s/data:image\/png;base64//; + open FILE, ">$file" or die "$!"; + print FILE decode_base64($data); + close FILE; } else { - push @icotool_args, $pngFileName; + shell $convert, $renderedSVGFileName, "-crop", "${width}x${height}+$x+$y", "-depth", $depth, $file; } - push @pngFiles, $pngFileName; + add_image( $file, $size ); } -# Render the SVG image -my @rsvgCmd; -push(@rsvgCmd, $rsvg); -push(@rsvgCmd, $svgFileName); -push(@rsvgCmd, "-o") if ($rsvg eq "rsvg-convert"); -push(@rsvgCmd, $renderedSVGFileName); -shell @rsvgCmd; - -# Render the images in the SVG -my $parser = new XML::Parser( - Handlers => {Start => \&svg_element_start}); -$parser->parsefile("$svgFileName"); - die "no render directive found in $svgFileName" unless @pngFiles; shell @icotool_args;

1 0

Alex Henrie : winmm/tests: Give play from 0 to 0 more time to finish.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 05111a34d5e1649b1c185d11e8f4fc2de6a24c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05111a34d5e1649b1c185d11e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 17 23:29:11 2017 -0600 winmm/tests: Give play from 0 to 0 more time to finish. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 52790c8..7c8aee8 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -848,7 +848,7 @@ static void test_playWAVE(HWND hwnd) err = mciSendStringA("play mysound from 250 to 0", NULL, 0, NULL); ok(err==MCIERR_OUTOFRANGE,"mci play from 250 to 0 returned %s\n", dbg_mcierr(err)); - Sleep(50); /* Give play from 0 to 0 time to finish. */ + Sleep(100); /* Give play from 0 to 0 time to finish. */ todo_wine test_notification(hwnd, "play from 0 to 0", MCI_NOTIFY_SUCCESSFUL); err = mciSendStringA("status mysound mode", buf, sizeof(buf), hwnd);

1 0

Stefan Dösinger : d3d9/tests: Windows 10 15.07 doesn' t detect external mode changes.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: eb7c1fd62eaac3847c86c855806f9d78c1c9a3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7c1fd62eaac3847c86c8558… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:22 2017 +0200 d3d9/tests: Windows 10 15.07 doesn't detect external mode changes. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 59a1daf..9dd3553 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2843,11 +2843,13 @@ static void test_wndproc(void) change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i); - /* Native needs a present call to pick up the mode change. */ + /* Native needs a present call to pick up the mode change. Windows 10 15.07 never picks up the mode change + * in these calls and returns S_OK. This is a regression from Windows 8 and has been fixed in later Win10 + * builds. */ hr = IDirect3DDevice9Ex_Present(device, NULL, NULL, NULL, NULL); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i); + todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i); hr = IDirect3DDevice9Ex_CheckDeviceState(device, device_window); - todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x, i=%u.\n", hr, i); + todo_wine ok(hr == S_PRESENT_MODE_CHANGED || broken(hr == S_OK), "Got unexpected hr %#x, i=%u.\n", hr, i); expect_messages = tests[i].focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or

1 0

Stefan Dösinger : d3d8/tests: Make test_reset more resilient against DPI scaling.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 1acef2b93d980710966afb331e1eb9e0bac12472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acef2b93d980710966afb331… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:21 2017 +0200 d3d8/tests: Make test_reset more resilient against DPI scaling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b35de66..9cebd17 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1312,7 +1312,7 @@ static void test_reset(void) UINT mode_count = 0; DEVMODEW devmode; IDirect3D8 *d3d8; - RECT winrect; + RECT winrect, client_rect; D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; @@ -1579,6 +1579,9 @@ static void test_reset(void) SWP_NOMOVE|SWP_NOZORDER), "SetWindowPos failed\n"); + /* Windows 10 gives us a different size than we requested with some DPI scaling settings (e.g. 172%). */ + GetClientRect(window, &client_rect); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = TRUE; @@ -1614,8 +1617,10 @@ static void test_reset(void) { ok(vp.X == 0, "D3DVIEWPORT->X = %u, expected 0.\n", vp.X); ok(vp.Y == 0, "D3DVIEWPORT->Y = %u, expected 0.\n", vp.Y); - ok(vp.Width == 200, "D3DVIEWPORT->Width = %u, expected 200.\n", vp.Width); - ok(vp.Height == 150, "D3DVIEWPORT->Height = %u, expected 150.\n", vp.Height); + ok(vp.Width == client_rect.right, "D3DVIEWPORT->Width = %d, expected %d\n", + vp.Width, client_rect.right); + ok(vp.Height == client_rect.bottom, "D3DVIEWPORT->Height = %d, expected %d\n", + vp.Height, client_rect.bottom); ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %.8e, expected 0.\n", vp.MinZ); ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %.8e, expected 1.\n", vp.MaxZ); } @@ -1627,8 +1632,10 @@ static void test_reset(void) ok(surface_desc.Format == d3ddm.Format, "Got unexpected Format %#x, expected %#x.\n", surface_desc.Format, d3ddm.Format); ok(!surface_desc.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); - ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); - ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); + ok(surface_desc.Width == client_rect.right, + "Back buffer width is %u, expected %d.\n", surface_desc.Width, client_rect.right); + ok(surface_desc.Height == client_rect.bottom, + "Back buffer height is %u, expected %d.\n", surface_desc.Height, client_rect.bottom); IDirect3DSurface8_Release(surface); memset(&d3dpp, 0, sizeof(d3dpp));

1 0

Stefan Dösinger : d3d9/tests: Make test_reset more resilient against DPI scaling.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 975a686aa0ef178447216c8ab2e2c945e145832e URL: http://source.winehq.org/git/wine.git/?a=commit;h=975a686aa0ef178447216c8ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 19 10:09:20 2017 +0200 d3d9/tests: Make test_reset more resilient against DPI scaling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 53 ++++++++++++++++++++++++++++++++---------------- dlls/d3d9/tests/device.c | 23 ++++++++++++++------- 2 files changed, 51 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=975a686aa0ef178447216…

1 0

Józef Kucia : wined3d: Use ARRAY_SIZE().
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 7f8e30bd1a1cfbe7ecf7ec7d358beba126adaeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8e30bd1a1cfbe7ecf7ec7d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 19 10:07:29 2017 +0200 wined3d: Use ARRAY_SIZE(). 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/context.c | 2 +- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/directx.c | 27 ++++++++++++--------------- dlls/wined3d/shader_sm4.c | 4 ++-- dlls/wined3d/state.c | 2 +- dlls/wined3d/stateblock.c | 12 ++++++------ dlls/wined3d/surface.c | 2 +- 7 files changed, 27 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f8e30bd1a1cfbe7ecf7e…

1 0

Józef Kucia : wined3d: Get rid of unneeded includes.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: c11251c188a402e168d48053f856c61542452259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11251c188a402e168d48053f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 19 10:07:28 2017 +0200 wined3d: Get rid of unneeded includes. math.h is included in wined3d_private.h 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/ati_fragment_shader.c | 1 - dlls/wined3d/drawprim.c | 3 --- dlls/wined3d/nvidia_texture_shader.c | 1 - dlls/wined3d/shader.c | 1 - 5 files changed, 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 04c0d70..80c7354 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -30,7 +30,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include "wined3d_private.h" diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 0fca3e6..2fd94bc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -21,7 +21,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include "wined3d_private.h" diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 235f87b..41eabba 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -33,9 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d); -#include <stdio.h> -#include <math.h> - /* Context activation is done by the caller. */ static void draw_primitive_arrays(struct wined3d_context *context, const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 9d3a3a1..0baa414 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -22,7 +22,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include "wined3d_private.h" diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f80467b..215f83b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -25,7 +25,6 @@ #include "config.h" #include "wine/port.h" -#include <math.h> #include <stdio.h> #include <string.h>

1 0

Józef Kucia : wined3d: Skip unhandled stream output components.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: 0832b5cded389096dcf74ac93367ae4ee4b8d35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0832b5cded389096dcf74ac93… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 19 10:07:27 2017 +0200 wined3d: Skip unhandled stream output components. This should at least avoid trashing other stream output elements. 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 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a03f179..108bd18 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -839,6 +839,8 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 if (e->component_idx || e->component_count != 4) { FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); + append_transform_feedback_skip_components(varyings, &count, + &strings, &length, buffer, e->component_count); continue; }

1 0

Józef Kucia : d3d10core/tests: Add test for shaders interstage interface.
by Alexandre Julliard 19 Oct '17

19 Oct '17

Module: wine Branch: master Commit: e162ae2333bcde601e111c644d13aec3d4100edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e162ae2333bcde601e111c644… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 19 10:07:26 2017 +0200 d3d10core/tests: Add test for shaders interstage interface. 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/d3d10core/tests/device.c | 160 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 819d949..0d063f6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9039,6 +9039,165 @@ static void test_shader_stage_input_output_matching(void) release_test_context(&test_context); } +static void test_shader_interstage_interface(void) +{ + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10InputLayout *input_layout; + ID3D10Texture2D *render_target; + ID3D10RenderTargetView *rtv; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + UINT stride, offset; + ID3D10Buffer *vb; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vertex + { + float4 position : SV_Position; + float2 t0 : TEXCOORD0; + nointerpolation float t1 : TEXCOORD1; + uint t2 : TEXCOORD2; + uint t3 : TEXCOORD3; + float t4 : TEXCOORD4; + }; + + void main(in vertex vin, out vertex vout) + { + vout = vin; + } +#endif + 0x43425844, 0xd55780bf, 0x76866b06, 0x45d697a2, 0xafac2ecd, 0x00000001, 0x000002bc, 0x00000003, + 0x0000002c, 0x000000e4, 0x0000019c, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000a4, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000a4, 0x00000002, 0x00000000, 0x00000001, 0x00000003, 0x00000101, 0x000000a4, + 0x00000003, 0x00000000, 0x00000001, 0x00000004, 0x00000101, 0x000000a4, 0x00000004, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, 0x00000003, 0x00000001, + 0x00000c03, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000b04, 0x000000a4, + 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000e01, 0x000000a4, 0x00000002, 0x00000000, + 0x00000001, 0x00000002, 0x00000d02, 0x000000a4, 0x00000003, 0x00000000, 0x00000001, 0x00000002, + 0x00000b04, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, 0xababab00, 0x52444853, + 0x00000118, 0x00010040, 0x00000046, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101032, + 0x00000001, 0x0300005f, 0x00101012, 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, + 0x00101012, 0x00000004, 0x0300005f, 0x00101012, 0x00000005, 0x04000067, 0x001020f2, 0x00000000, + 0x00000001, 0x03000065, 0x00102032, 0x00000001, 0x03000065, 0x00102042, 0x00000001, 0x03000065, + 0x00102012, 0x00000002, 0x03000065, 0x00102022, 0x00000002, 0x03000065, 0x00102042, 0x00000002, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102032, 0x00000001, + 0x00101046, 0x00000001, 0x05000036, 0x00102042, 0x00000001, 0x0010100a, 0x00000005, 0x05000036, + 0x00102012, 0x00000002, 0x0010100a, 0x00000002, 0x05000036, 0x00102022, 0x00000002, 0x0010100a, + 0x00000003, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000004, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, float2 t0 : TEXCOORD0, + nointerpolation float t1 : TEXCOORD1, uint t2 : TEXCOORD2, + uint t3 : TEXCOORD3, float t4 : TEXCOORD4, out float4 o : SV_Target) + { + o.x = t0.y + t1; + o.y = t2 + t3; + o.z = t4; + o.w = t0.x; + } +#endif + 0x43425844, 0x8a7ef706, 0xc8f2cbf1, 0x83a05df1, 0xfab8e613, 0x00000001, 0x000001dc, 0x00000003, + 0x0000002c, 0x000000e4, 0x00000118, 0x4e475349, 0x000000b0, 0x00000006, 0x00000008, 0x00000098, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x000000a4, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x000000a4, 0x00000004, 0x00000000, 0x00000003, 0x00000001, + 0x00000404, 0x000000a4, 0x00000001, 0x00000000, 0x00000003, 0x00000002, 0x00000101, 0x000000a4, + 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000202, 0x000000a4, 0x00000003, 0x00000000, + 0x00000001, 0x00000002, 0x00000404, 0x505f5653, 0x7469736f, 0x006e6f69, 0x43584554, 0x44524f4f, + 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000bc, + 0x00000040, 0x0000002f, 0x03001062, 0x00101032, 0x00000001, 0x03001062, 0x00101042, 0x00000001, + 0x03000862, 0x00101012, 0x00000002, 0x03000862, 0x00101022, 0x00000002, 0x03000862, 0x00101042, + 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0700001e, 0x00100012, + 0x00000000, 0x0010101a, 0x00000002, 0x0010102a, 0x00000002, 0x05000056, 0x00102022, 0x00000000, + 0x0010000a, 0x00000000, 0x07000000, 0x00102012, 0x00000000, 0x0010101a, 0x00000001, 0x0010100a, + 0x00000002, 0x05000036, 0x001020c2, 0x00000000, 0x001012a6, 0x00000001, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 1, DXGI_FORMAT_R32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 2, DXGI_FORMAT_R32_UINT, 0, 20, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 3, DXGI_FORMAT_R32_UINT, 0, 24, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 4, DXGI_FORMAT_R32_FLOAT, 0, 28, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const struct + { + struct vec2 position; + struct vec2 t0; + float t1; + unsigned int t2; + unsigned int t3; + float t4; + } + quad[] = + { + {{-1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{-1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{ 1.0f, -1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + {{ 1.0f, 1.0f}, {3.0f, 5.0f}, 5.0f, 2, 6, 7.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 expected_result = {10.0f, 8.0f, 7.0f, 3.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &render_target); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)render_target, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(quad), quad); + + ID3D10Device_ClearRenderTargetView(device, rtv, white); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + offset = 0; + stride = sizeof(*quad); + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_Draw(device, 4, 0); + check_texture_vec4(render_target, &expected_result, 0); + + ID3D10InputLayout_Release(input_layout); + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(render_target); + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10Buffer_Release(vb); + release_test_context(&test_context); +} + static void test_sm4_if_instruction(void) { struct d3d10core_test_context test_context; @@ -12598,6 +12757,7 @@ START_TEST(device) test_clear_depth_stencil_view(); test_draw_depth_only(); test_shader_stage_input_output_matching(); + test_shader_interstage_interface(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); test_sm4_continuec_instruction();

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
48
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 October 2017