October 2018 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the "desc" field in struct wined3d_buffer.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 22b3a4f044036e62104a6994828d18d3536b3d78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22b3a4f044036e62104a6994… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:46 2018 +0330 wined3d: Get rid of the "desc" field in struct wined3d_buffer. Most of the information in "desc" is already stored in the wined3d_resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/view.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 58e5685..8c7a23f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1302,7 +1302,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc offset = size = 0; } - map_desc->row_pitch = map_desc->slice_pitch = buffer_gl->b.desc.byte_width; + map_desc->row_pitch = map_desc->slice_pitch = resource->size; return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); } @@ -1385,8 +1385,8 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->desc = *desc; buffer->bind_flags = desc->bind_flags; + buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; TRACE("buffer %p, size %#x, usage %#x, format %s, memory @ %p.\n", diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 004611e..59a30ea 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -110,7 +110,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ struct wined3d_buffer *buffer = buffer_from_resource(resource); unsigned int buffer_size, element_size; - if (buffer->desc.structure_byte_stride) + if (buffer->structure_byte_stride) { if (desc->format_id != WINED3DFMT_UNKNOWN) { @@ -119,7 +119,7 @@ static const struct wined3d_format *validate_resource_view(const struct wined3d_ } format = wined3d_get_format(adapter, WINED3DFMT_R32_UINT, resource->usage); - element_size = buffer->desc.structure_byte_stride; + element_size = buffer->structure_byte_stride; } else { @@ -293,8 +293,8 @@ static void get_buffer_view_range(const struct wined3d_buffer *buffer, { if (desc->format_id == WINED3DFMT_UNKNOWN) { - *offset = desc->u.buffer.start_idx * buffer->desc.structure_byte_stride; - *size = desc->u.buffer.count * buffer->desc.structure_byte_stride; + *offset = desc->u.buffer.start_idx * buffer->structure_byte_stride; + *size = desc->u.buffer.count * buffer->structure_byte_stride; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84bf14d..87541aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3772,9 +3772,8 @@ struct wined3d_buffer { struct wined3d_resource resource; - struct wined3d_buffer_desc desc; - unsigned int bind_flags; + unsigned int structure_byte_stride; DWORD flags; DWORD locations; void *map_ptr;

1 0

Henri Verbeet : wined3d: Store resource bind flags in the wined3d_resource structure.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 45bf95278d669779e6ca3cde9215556a043a8cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45bf95278d669779e6ca3cde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 13:36:47 2018 +0330 wined3d: Store resource bind flags in the wined3d_resource structure. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 13 ++++++------- dlls/wined3d/resource.c | 5 +++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8c7a23f..4c90d82 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -155,11 +155,11 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu * rarely. */ if (resource->bind_count) { - if (buffer_gl->b.bind_flags & WINED3D_BIND_VERTEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_VERTEX_BUFFER) device_invalidate_state(resource->device, STATE_STREAMSRC); - if (buffer_gl->b.bind_flags & WINED3D_BIND_INDEX_BUFFER) + if (resource->bind_flags & WINED3D_BIND_INDEX_BUFFER) device_invalidate_state(resource->device, STATE_INDEXBUFFER); - if (buffer_gl->b.bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + if (resource->bind_flags & WINED3D_BIND_CONSTANT_BUFFER) { device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_HULL)); @@ -168,7 +168,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_PIXEL)); device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } - if (buffer_gl->b.bind_flags & WINED3D_BIND_STREAM_OUTPUT) + if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); if (context->transform_feedback_active) @@ -1379,13 +1379,12 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } if (FAILED(hr = resource_init(resource, device, WINED3D_RTYPE_BUFFER, format, - WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->access, desc->byte_width, 1, 1, - desc->byte_width, parent, parent_ops, &buffer_resource_ops))) + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->bind_flags, desc->access, + desc->byte_width, 1, 1, desc->byte_width, parent, parent_ops, &buffer_resource_ops))) { WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } - buffer->bind_flags = desc->bind_flags; buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 9df0a09..a1b2cbd 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -56,8 +56,8 @@ static void resource_check_usage(DWORD usage) HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, - unsigned int usage, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { @@ -183,6 +183,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_type = multisample_type; resource->multisample_quality = multisample_quality; resource->usage = usage; + resource->bind_flags = bind_flags; resource->access = access; resource->width = width; resource->height = height; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 907ede7..87998d5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2996,7 +2996,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, - desc->multisample_type, desc->multisample_quality, desc->usage, desc->access, + desc->multisample_type, desc->multisample_quality, desc->usage, 0, desc->access, desc->width, desc->height, desc->depth, offset, parent, parent_ops, &texture_resource_ops))) { static unsigned int once; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 87541aa..9a01ed2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3113,6 +3113,7 @@ struct wined3d_resource enum wined3d_multisample_type multisample_type; UINT multisample_quality; DWORD usage; + unsigned int bind_flags; unsigned int access; WORD draw_binding; WORD map_binding; @@ -3153,8 +3154,8 @@ static inline void wined3d_resource_release(struct wined3d_resource *resource) void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format, - enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, - unsigned int usage, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, + enum wined3d_multisample_type multisample_type, unsigned int multisample_quality, unsigned int usage, + unsigned int bind_flags, unsigned int access, unsigned int width, unsigned int height, unsigned int depth, unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -3772,7 +3773,6 @@ struct wined3d_buffer { struct wined3d_resource resource; - unsigned int bind_flags; unsigned int structure_byte_stride; DWORD flags; DWORD locations;

1 0

Sergio Gómez Del Real : comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: wine Branch: master Commit: 0d4a1f7bee1ba859dfe8a95267772ba0222dbbbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d4a1f7bee1ba859dfe8a952… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Mon Oct 29 22:10:10 2018 -0500 comctl32: Implement handling of EM_SETCUEBANNER/EM_GETCUEBANNER messages. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 67 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/edit.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index f0180ad..aeba9f7 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -131,6 +131,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + WCHAR *cue_banner_text; /* * only for multi line controls */ @@ -2181,6 +2182,12 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) x += EDIT_PaintText(es, dc, x, y, line, e - li, li + ll - e, FALSE); } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); + + if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED)) + { + SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); + TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); + } } @@ -4152,6 +4159,57 @@ static LRESULT EDIT_EM_GetThumb(EDITSTATE *es) EDIT_WM_HScroll(es, EM_GETTHUMB, 0)); } +static inline WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +/********************************************************************* + * + * EM_SETCUEBANNER + * + */ +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +{ + if (es->style & ES_MULTILINE || !cue_text) + return FALSE; + + if (focus) + FIXME("cue banner for focused control not implemented.\n"); + + heap_free(es->cue_banner_text); + es->cue_banner_text = heap_strdupW(cue_text); + + return TRUE; +} + +/********************************************************************* + * + * EM_GETCUEBANNER + * + */ +static BOOL EDIT_EM_GetCueBanner(EDITSTATE *es, WCHAR *buf, DWORD size) +{ + if (es->style & ES_MULTILINE) + return FALSE; + + if (!es->cue_banner_text) + { + if (buf && size) + *buf = 0; + return FALSE; + } + else + { + if (buf) + lstrcpynW(buf, es->cue_banner_text, size); + return TRUE; + } +} + /******************************************************************** * @@ -4489,6 +4547,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) SetWindowLongPtrW( es->hwndSelf, 0, 0 ); heap_free(es->undo_text); + heap_free(es->cue_banner_text); heap_free(es); return 0; @@ -4703,6 +4762,14 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_EM_CharFromPos(es, (short)LOWORD(lParam), (short)HIWORD(lParam)); break; + case EM_SETCUEBANNER: + result = EDIT_EM_SetCueBanner(es, (BOOL)wParam, (const WCHAR *)lParam); + break; + + case EM_GETCUEBANNER: + result = EDIT_EM_GetCueBanner(es, (WCHAR *)wParam, (DWORD)lParam); + break; + /* End of the EM_ messages which were in numerical order; what order * are these in? vaguely alphabetical? */ diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index a5097d1..bc44d0c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3061,6 +3061,83 @@ static const struct message killfocus_combined_seq[] = { 0 } }; +static void test_cue_banner(void) +{ + HWND hwnd_edit; + BOOL ret; + static WCHAR getcuetestW[5] = {'T',0}; + static const WCHAR testcmp1W[] = {'T','e','s','t',0}; + static const WCHAR testcmp2W[] = {'T','e','s',0}; + static const WCHAR emptyW[] = {0}; + + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + if (lstrcmpW(getcuetestW, emptyW) != 0) + { + win_skip("skipping for Win XP and 2003 Server.\n"); + DestroyWindow(hwnd_edit); + return; + } + ok(lstrcmpW(getcuetestW, emptyW) == 0, "First char is %c\n", getcuetestW[0]); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 0); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_SETCUEBANNER should have returned FALSE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 0); + ok(ret == FALSE, "EM_GETCUEBANNER should have returned FALSE.\n"); + + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, 0, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)emptyW); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, emptyW) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + + /* EM_GETCUEBANNER's buffer size includes null char */ + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)testcmp1W); + ok(ret == TRUE, "EM_SETCUEBANNER should have returned TRUE.\n"); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)+1); + ok(ret == TRUE, "EM_GETCUEBANNER should have returned TRUE.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + memset(getcuetestW, 0, lstrlenW(testcmp1W)*sizeof(WCHAR)); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, (LPARAM)lstrlenW(testcmp1W)); + ok(lstrcmpW(getcuetestW, testcmp2W) == 0, "EM_GETCUEBANNER returned string %s.\n", wine_dbgstr_w(getcuetestW)); + DestroyWindow(hwnd_edit); + + /* setting cue banner fails for multi-line edit controls */ + hwnd_edit = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + lstrcpyW(getcuetestW, testcmp1W); + ret = SendMessageW(hwnd_edit, EM_GETCUEBANNER, (WPARAM)getcuetestW, 5); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + ok(lstrcmpW(getcuetestW, testcmp1W) == 0, "String was %s.\n", wine_dbgstr_w(getcuetestW)); + ret = SendMessageW(hwnd_edit, EM_SETCUEBANNER, 0, (LPARAM)getcuetestW); + ok(ret == FALSE, "EM_SETCUEBANNER.\n"); + + DestroyWindow(hwnd_edit); +} + static void test_change_focus(void) { HWND hwnd, parent_wnd; @@ -3138,6 +3215,7 @@ START_TEST(edit) test_EM_GETLINE(); test_wordbreak_proc(); test_change_focus(); + test_cue_banner(); UnregisterWindowClasses();

1 0

Francois Gouget : testbot: Specify which test units to rerun with the ' test' mission option.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: tools Branch: master Commit: 290f9e17ce7e375ac3dee55d43b4915fa58539fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=290f9e17ce7e375ac3dee55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 30 14:08:39 2018 +0100 testbot: Specify which test units to rerun with the 'test' mission option. If set to 'all', then any non-test patch will cause a full WineTest run. If set to 'module', then only the patched module's tests will be run. If set to 'test' or unset, then the current behavior is preserved so that only patched test units are run. If set to 'build', then only verify that the patch builds. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineReconfig.pl | 8 ++++--- testbot/bin/build/WineTest.pl | 43 +++++++++++++++++++++++++++-------- testbot/lib/WineTestBot/Missions.pm | 6 ++++- testbot/lib/WineTestBot/PatchUtils.pm | 25 ++++++++++++++------ testbot/web/admin/VMDetails.pl | 1 + 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index f46408b..53ce319 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -104,13 +104,15 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving # time. Note that this requires using a different wineprefix for each build. - foreach my $Build ("win32", "wow64", "wow32") + foreach my $Mission (@{$TaskMissions->{Missions}}) { - next if (!$TaskMissions->{Builds}->{$Build}); + next if ($Mission->{test} eq "build"); + + SetupWineEnvironment($Build); + InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - SetupWineEnvironment($Build); my $ErrMessage = CreateWinePrefix($Build, "wait"); if (defined $ErrMessage) { diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index ecb3299..078f01b 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -122,25 +122,48 @@ sub TestPatch($$) { my ($Mission, $Impacts) = @_; + return 1 if ($Mission->{test} eq "build"); + my @TestList; - foreach my $Module (sort keys %{$Impacts->{Tests}}) + if ($Mission->{test} eq "all" and + ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules})) { - my $TestInfo = $Impacts->{Tests}->{$Module}; - if ($TestInfo->{All}) - { - push @TestList, $Module; - } - else + push @TestList, "-m", "do.not.submit"; + } + else + { + foreach my $Module (sort keys %{$Impacts->{Tests}}) { - foreach my $Unit (sort keys %{$TestInfo->{Units}}) + my $TestInfo = $Impacts->{Tests}->{$Module}; + if ($TestInfo->{All} or + ($Mission->{test} eq "module" and $TestInfo->{PatchedModule})) { - push @TestList, "$Module:$Unit"; + # When given a module name WineTest runs all its tests. + # But make sure the module actually has tests first! + push @TestList, $Module if (%{$TestInfo->{Units}}); + } + else + { + foreach my $Unit (sort keys %{$TestInfo->{Units}}) + { + push @TestList, "$Module:$Unit"; + } } } + return 1 if (!@TestList); } - return 1 if (!@TestList); SetupTest("the tests", $Mission); + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + return 0; + } + } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 58b3340..80c1d97 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -64,7 +64,11 @@ sub ParseMissionStatement($) } $Build = $1; # untaint $TaskMissions->{Builds}->{$Build} = 1; - my $Mission = { Build => $Build, Statement => $Statement }; + my $Mission = { + Build => $Build, + Statement => $Statement, + test => "test", # Set the default value + }; push @{$TaskMissions->{Missions}}, $Mission; foreach my $Option (@Options) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index fb4f886..0e17a70 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -492,15 +492,26 @@ sub GetTestTimeout($$) { my ($Impacts, $TaskMissions) = @_; - my $Timeout = $SuiteTimeout; - if ($Impacts) + my $Timeout = 0; + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $UnitCount = $Impacts->{TestUnitCount}; - my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + - max(0, $UnitCount - 2) * $SingleAvgTime; - $Timeout = min($SuiteTimeout, $TestsTimeout); + if (!$Impacts or ($Mission->{test} eq "all" and + ($Impacts->{PatchedRoot} or $Impacts->{PatchedModules}))) + { + $Timeout += $SuiteTimeout; + } + elsif ($Mission->{test} ne "build") + { + # Note: If only test units have been patched then + # ModuleUnitCount == TestUnitCount. + my $UnitCount = $Mission->{test} eq "test" ? $Impacts->{TestUnitCount} : + $Impacts->{ModuleUnitCount}; + my $TestsTimeout = min(2, $UnitCount) * $SingleTimeout + + max(0, $UnitCount - 2) * $SingleAvgTime; + $Timeout += min($SuiteTimeout, $TestsTimeout); + } } - return @{$TaskMissions->{Missions}} * $Timeout; + return $Timeout; } 1; diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 5f49c68..4b7799a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -78,6 +78,7 @@ sub GenerateFooter($) print "Each mission is composed of a build and options separated by commas: build,option1=value,option2,.... The value can be omitted for boolean options and defaults to true. \n"; print "The supported builds are build for build VMs; exe32 and exe64 for Windows VMs; win32, wow32 and wow64 for Wine VMs.\n"; print "On Wine VMs: \n"; + print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n";

1 0

Józef Kucia : vkd3d-shader: Simplify vkd3d_dxbc_compiler_emit_load_scalar().
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: vkd3d Branch: master Commit: ebf09feb8243c6fdb971f37e56d6d0b03f92a7dc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebf09feb8243c6fdb971f37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:49 2018 +0100 vkd3d-shader: Simplify vkd3d_dxbc_compiler_emit_load_scalar(). 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> --- libs/vkd3d-shader/spirv.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 234b7c8..e43f48a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2623,12 +2623,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile } static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) + const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask, + const struct vkd3d_shader_register_info *reg_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, indexes[1], reg_id, val_id; unsigned int component_idx, reg_component_count; - struct vkd3d_shader_register_info reg_info; enum vkd3d_component_type component_type; assert(reg->type != VKD3DSPR_IMMCONST); @@ -2638,22 +2638,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler component_idx = vkd3d_swizzle_get_component(swizzle, component_idx); component_type = vkd3d_component_type_from_data_type(reg->data_type); - if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) - { - type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); - return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); - } - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - reg_component_count = vkd3d_write_mask_component_count(reg_info.write_mask); + reg_component_count = vkd3d_write_mask_component_count(reg_info->write_mask); if (component_idx > reg_component_count) ERR("Invalid component_idx for register %#x, %u.\n", reg->type, reg->idx[0].offset); - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, 1); - reg_id = reg_info.id; + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + reg_id = reg_info->id; if (reg_component_count != 1) { - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); reg_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, reg_id, indexes, ARRAY_SIZE(indexes)); @@ -2661,7 +2655,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); - if (component_type != reg_info.component_type) + if (component_type != reg_info->component_type) { type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); @@ -2683,9 +2677,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co return vkd3d_dxbc_compiler_emit_load_constant(compiler, reg, swizzle, write_mask); component_count = vkd3d_write_mask_component_count(write_mask); - if (component_count == 1) - return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask); - component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) { @@ -2694,6 +2685,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + if (component_count == 1) + return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone);

1 0

Józef Kucia : vkd3d-shader: Implement vkd3d_write_mask_component_count() on top of vkd3d_popcount().
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: vkd3d Branch: master Commit: 6b9c58979507eb529a993b52bbe2537f553ada23 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b9c58979507eb529a993b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:51 2018 +0100 vkd3d-shader: Implement vkd3d_write_mask_component_count() on top of vkd3d_popcount(). 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> --- libs/vkd3d-shader/vkd3d_shader_private.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1d79c91..dd3650b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -866,16 +866,8 @@ static inline unsigned int vkd3d_write_mask_get_component_idx(DWORD write_mask) static inline unsigned int vkd3d_write_mask_component_count(DWORD write_mask) { - unsigned int i, count = 0; - assert(write_mask); - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) - { - if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - ++count; - } - - return count; + return vkd3d_popcount(write_mask & VKD3DSP_WRITEMASK_ALL); } static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int component_count)

1 0

Józef Kucia : vkd3d-shader: Rename "output setup" function to "shader epilogue".
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: vkd3d Branch: master Commit: 7b58e7cb23a59a4a26aaf1e65c4ca5ad656e6b8e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7b58e7cb23a59a4a26aaf1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:47 2018 +0100 vkd3d-shader: Rename "output setup" function to "shader epilogue". 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> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 09c6f9f..9419dc4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1883,7 +1883,7 @@ struct vkd3d_dxbc_compiler uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ - uint32_t output_setup_function_id; + uint32_t epilogue_function_id; uint32_t dummy_sampler_id; uint32_t binding_idx; @@ -3545,8 +3545,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { unsigned int idx = vkd3d_dxbc_compiler_get_output_variable_index(compiler, reg->idx[0].offset); compiler->private_output_variable[idx] = var_id; - if (!compiler->output_setup_function_id) - compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); + if (!compiler->epilogue_function_id) + compiler->epilogue_function_id = vkd3d_spirv_alloc_id(builder); } } @@ -4981,13 +4981,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_conditional_branch(struct vkd3d_dxbc_co return merge_block_id; } -static void vkd3d_dxbc_compiler_emit_output_setup_invocation(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_id, arguments[MAX_REG_OUTPUT]; unsigned int i, count; - if ((function_id = compiler->output_setup_function_id)) + if ((function_id = compiler->epilogue_function_id)) { void_id = vkd3d_spirv_get_op_type_void(builder); for (i = 0, count = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) @@ -5006,7 +5006,7 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_return(builder); } @@ -6455,7 +6455,7 @@ static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *com return; } - vkd3d_dxbc_compiler_emit_output_setup_invocation(compiler); + vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); vkd3d_spirv_build_op_emit_vertex(builder); } @@ -6857,7 +6857,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi } } -static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) +static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_compiler *compiler) { uint32_t param_type_id[MAX_REG_OUTPUT + 1], param_id[MAX_REG_OUTPUT + 1] = {}; const struct vkd3d_shader_signature *signature = compiler->output_signature; @@ -6866,7 +6866,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com unsigned int i, count; DWORD variable_idx; - function_id = compiler->output_setup_function_id; + function_id = compiler->epilogue_function_id; assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_id)); assert(ARRAY_SIZE(compiler->private_output_variable) == ARRAY_SIZE(param_type_id)); @@ -6883,7 +6883,7 @@ static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_com vkd3d_spirv_build_op_function(builder, void_id, function_id, SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, function_id, "setup_output"); + vkd3d_spirv_build_op_name(builder, function_id, "epilogue"); for (i = 0; i < ARRAY_SIZE(compiler->private_output_variable); ++i) { @@ -6922,8 +6922,8 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_function_end(builder); - if (compiler->output_setup_function_id) - vkd3d_dxbc_compiler_emit_output_setup_function(compiler); + if (compiler->epilogue_function_id) + vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) vkd3d_spirv_stream_clear(&builder->debug_stream);

1 0

Józef Kucia : vkd3d-shader: Add structure type fields to public API structures.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: vkd3d Branch: master Commit: f97b745ae7587166ee177f634721fc7a6bc10858 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f97b745ae7587166ee177f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:53 2018 +0100 vkd3d-shader: Add structure type fields to public API structures. 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> --- include/private/vkd3d_shader.h | 20 +++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 20 ++++++++++++++++++++ libs/vkd3d/state.c | 10 +++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index e97e185..f96e505 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -25,6 +25,15 @@ extern "C" { #define VKD3D_FORCE_32_BIT_ENUM(name) name##_FORCE_32BIT = 0x7fffffff +enum vkd3d_shader_structure_type +{ + VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, + VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, + VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), +}; + enum vkd3d_result { VKD3D_OK = 0, @@ -130,6 +139,9 @@ struct vkd3d_shader_push_constant_buffer struct vkd3d_shader_interface { + enum vkd3d_shader_structure_type type; + const void *next; + const struct vkd3d_shader_resource_binding *bindings; unsigned int binding_count; @@ -160,8 +172,11 @@ enum vkd3d_shader_target struct vkd3d_shader_compile_arguments { + enum vkd3d_shader_structure_type type; + const void *next; + enum vkd3d_shader_target target; - unsigned int *output_swizzles; + const unsigned int *output_swizzles; unsigned int output_swizzle_count; }; @@ -366,6 +381,9 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc struct vkd3d_shader_scan_info { + enum vkd3d_shader_structure_type type; + void *next; + unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int sampler_comparison_mode_mask; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f813208..5e292c7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -61,6 +61,12 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ if (!compile_args) return VKD3D_OK; + if (compile_args->type != VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS) + { + WARN("Invalid structure type %#x.\n", compile_args->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + switch (compile_args->target) { case VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5: @@ -88,9 +94,17 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + if (shader_interface && shader_interface->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE) + { + WARN("Invalid structure type %#x.\n", shader_interface->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if ((ret = vkd3d_shader_validate_compile_args(compile_args)) < 0) return ret; + scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + scan_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(dxbc, &scan_info)) < 0) return ret; @@ -209,6 +223,12 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, TRACE("dxbc {%p, %zu}, scan_info %p.\n", dxbc->code, dxbc->size, scan_info); + if (scan_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO) + { + WARN("Invalid structure type %#x.\n", scan_info->type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + if ((ret = vkd3d_shader_parser_init(&parser, dxbc)) < 0) return ret; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4800ff3..3f3de4d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1439,6 +1439,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st dxbc.code = desc->CS.pShaderBytecode; dxbc.size = desc->CS.BytecodeLength; + shader_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + shader_info.next = NULL; if ((ret = vkd3d_shader_scan_dxbc(&dxbc, &shader_info)) < 0) { WARN("Failed to scan shader bytecode, vkd3d result %d.\n", ret); @@ -1452,6 +1454,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -2027,10 +2031,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s } graphics->attachment_count = graphics->rt_idx + rt_count; + ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; + ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; shader_interface.push_constant_buffers = root_signature->root_constants; @@ -2044,8 +2052,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { const D3D12_SHADER_BYTECODE *b = (const void *)((uintptr_t)desc + shader_stages[i].offset); + struct vkd3d_shader_scan_info shader_info = {VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO}; const struct vkd3d_shader_code dxbc = {b->pShaderBytecode, b->BytecodeLength}; - struct vkd3d_shader_scan_info shader_info; if (!b->pShaderBytecode) continue;

1 0

Józef Kucia : vkd3d-shader: Add support for stores to scalar variables.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: vkd3d Branch: master Commit: 78a09d37d22bc5ea83d03a2ab8aabf15a14b5b12 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=78a09d37d22bc5ea83d03a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:50 2018 +0100 vkd3d-shader: Add support for stores to scalar variables. 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> --- libs/vkd3d-shader/spirv.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e43f48a..4fc25ee 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2789,19 +2789,22 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, chain_id, index[1]; + uint32_t type_id, ptr_type_id, id, index[1]; unsigned int component_idx; assert(reg->type != VKD3DSPR_IMMCONST); - type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); - component_idx = vkd3d_write_mask_get_component_idx(write_mask); - index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info->id, index, ARRAY_SIZE(index)); + id = reg_info->id; + if (vkd3d_write_mask_component_count(reg_info->write_mask) > 1) + { + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); + component_idx = vkd3d_write_mask_get_component_idx(write_mask); + index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); + id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, id, index, ARRAY_SIZE(index)); + } - vkd3d_spirv_build_op_store(builder, chain_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, id, val_id, SpvMemoryAccessMaskNone); } static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Use typed shader outputs directly.
by Alexandre Julliard Oct. 30, 2018

Oct. 30, 2018

Module: vkd3d Branch: master Commit: d2e5ced1ace45603cfb8b1338f9fced2f82a8baa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d2e5ced1ace45603cfb8b13… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 30 15:22:48 2018 +0100 vkd3d-shader: Use typed shader outputs directly. 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> --- libs/vkd3d-shader/spirv.c | 56 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9419dc4..234b7c8 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2791,25 +2791,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src(struct vkd3d_dxbc_compiler *co } static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, DWORD write_mask, + const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, chain_id, index[1]; - struct vkd3d_shader_register_info reg_info; unsigned int component_idx; assert(reg->type != VKD3DSPR_IMMCONST); - if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) - return; - vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); + type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); chain_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_info.id, index, ARRAY_SIZE(index)); + ptr_type_id, reg_info->id, index, ARRAY_SIZE(index)); vkd3d_spirv_build_op_store(builder, chain_id, val_id, SpvMemoryAccessMaskNone); } @@ -2818,35 +2814,39 @@ static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t reg_id, type_id, reg_val_id; + struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; + uint32_t type_id, reg_val_id; unsigned int component_count; assert(reg->type != VKD3DSPR_IMMCONST); assert(write_mask); component_count = vkd3d_write_mask_component_count(write_mask); + component_type = vkd3d_component_type_from_data_type(reg->data_type); + if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) + return; + vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - if (reg->data_type != VKD3D_DATA_FLOAT) + if (component_type != reg_info.component_type) { - uint32_t type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, component_count); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); } if (component_count == 1) - return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, val_id); - - reg_id = vkd3d_dxbc_compiler_get_register_id(compiler, reg); + return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, &reg_info, val_id); if (component_count != VKD3D_VEC4_SIZE) { - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); + type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, VKD3D_VEC4_SIZE); + reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - reg_val_id, val_id, write_mask, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + reg_val_id, val_id, write_mask, reg_info.component_type, VKD3D_VEC4_SIZE); } - vkd3d_spirv_build_op_store(builder, reg_id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, reg_info.id, val_id, SpvMemoryAccessMaskNone); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler, @@ -3275,6 +3275,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi for (i = 0; i < max(array_size, 1); ++i) { struct vkd3d_shader_register dst_reg = *reg; + dst_reg.data_type = VKD3D_DATA_FLOAT; val_id = input_id; if (array_size) @@ -3515,7 +3516,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE + use_private_variable = component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE || (builtin && builtin->is_spirv_array); if (use_private_variable) @@ -3534,7 +3535,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.component_type = use_private_variable ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); @@ -4521,22 +4522,25 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + struct vkd3d_shader_register_info dst_reg_info, src_reg_info; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t val_id, dst_val_id, type_id, dst_id, src_id; - struct vkd3d_shader_register_info reg_info; uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; component_count = vkd3d_write_mask_component_count(dst->write_mask); - memset(&reg_info, 0, sizeof(reg_info)); + vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &dst_reg_info); + memset(&src_reg_info, 0, sizeof(src_reg_info)); if (src->reg.type != VKD3DSPR_IMMCONST) - vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &reg_info); + vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &src_reg_info); if (component_count == 1 || component_count == VKD3D_VEC4_SIZE || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST - || reg_info.component_type != VKD3D_TYPE_FLOAT || reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) + || dst_reg_info.component_type != src_reg_info.component_type + || dst_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL + || src_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) { val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); @@ -4545,7 +4549,7 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, dst_reg_info.component_type, VKD3D_VEC4_SIZE); dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg);

1 0