June 2022 - Wine-Commits - list.winehq.org

Paul Gofman : opengl32/tests: Add more tests for ChoosePixelFormat().
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: 83cbcdefa3f55afc449b6be51e215c4f646869f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cbcdefa3f55afc449b6be5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 21 10:29:18 2022 -0500 opengl32/tests: Add more tests for ChoosePixelFormat(). Test extended by Matteo Bruni. --- dlls/opengl32/tests/opengl.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8b0e70ccf9c..f05bb09d4b6 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -342,6 +342,61 @@ static void test_choosepixelformat(void) pfd.cDepthBits = 0; pfd.cStencilBits = 0; pfd.dwFlags &= ~PFD_DEPTH_DONTCARE; + + pfd.cDepthBits = 16; + ok( test_pfd(&pfd, &ret_fmt), "depth 16 failed.\n" ); + ok( ret_fmt.cDepthBits >= 16, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + pfd.cDepthBits = 0; + + pfd.cDepthBits = 16; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 16, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 16, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 8; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 8, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 8, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 24; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 24, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 32; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; + + pfd.cDepthBits = 32; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cDepthBits >= 24, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); + ok( !ret_fmt.cStencilBits, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cDepthBits = 0; + + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cStencilBits = 0; + + pfd.cDepthBits = 1; + pfd.cStencilBits = 8; + ok( test_pfd(&pfd, &ret_fmt), "depth 32, stencil 8 failed.\n" ); + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); + pfd.cStencilBits = 0; + pfd.cDepthBits = 0; } static void WINAPI gl_debug_message_callback(GLenum source, GLenum type, GLuint id, GLenum severity,

1 0

Zhiyi Zhang : uxtheme: Support parsing more scrollbar parts and states.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: 461c49ec84ed872df12c68aa98dc9a3f2e502d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=461c49ec84ed872df12c68aa… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 16:08:48 2022 +0800 uxtheme: Support parsing more scrollbar parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 27 +++++++++++++++++++++++++++ include/vsstyle.h | 1 + 2 files changed, 28 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 2d8ea05bb5c..b8e9eb95e43 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -841,41 +841,68 @@ static const MSSTYLES_CLASS_MAP classScrollbar[] = { {SBP_ARROWBTN, ABS_RIGHTHOT, L"RIGHTHOT"}, {SBP_ARROWBTN, ABS_RIGHTPRESSED, L"RIGHTPRESSED"}, {SBP_ARROWBTN, ABS_RIGHTDISABLED, L"RIGHTDISABLED"}, + {SBP_ARROWBTN, ABS_UPHOVER, L"UPHOVER"}, + {SBP_ARROWBTN, ABS_DOWNHOVER, L"DOWNHOVER"}, + {SBP_ARROWBTN, ABS_LEFTHOVER, L"LEFTHOVER"}, + {SBP_ARROWBTN, ABS_RIGHTHOVER, L"RIGHTHOVER"}, {SBP_THUMBBTNHORZ, 0, L"THUMBBTNHORZ"}, {SBP_THUMBBTNHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNHORZ, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_THUMBBTNVERT, 0, L"THUMBBTNVERT"}, {SBP_THUMBBTNVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_THUMBBTNVERT, SCRBS_HOT, L"HOT"}, {SBP_THUMBBTNVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_THUMBBTNVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_THUMBBTNVERT, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKHORZ, 0, L"LOWERTRACKHORZ"}, {SBP_LOWERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKHORZ, 0, L"UPPERTRACKHORZ"}, {SBP_UPPERTRACKHORZ, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKHORZ, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKHORZ, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_LOWERTRACKVERT, 0, L"LOWERTRACKVERT"}, {SBP_LOWERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_LOWERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_LOWERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_LOWERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_LOWERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_UPPERTRACKVERT, 0, L"UPPERTRACKVERT"}, {SBP_UPPERTRACKVERT, SCRBS_NORMAL, L"NORMAL"}, {SBP_UPPERTRACKVERT, SCRBS_HOT, L"HOT"}, {SBP_UPPERTRACKVERT, SCRBS_PRESSED, L"PRESSED"}, {SBP_UPPERTRACKVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_UPPERTRACKVERT, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERHORZ, 0, L"GRIPPERHORZ"}, + {SBP_GRIPPERHORZ, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERHORZ, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERHORZ, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERHORZ, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERHORZ, SCRBS_HOVER, L"HOVER"}, {SBP_GRIPPERVERT, 0, L"GRIPPERVERT"}, + {SBP_GRIPPERVERT, SCRBS_NORMAL, L"NORMAL"}, + {SBP_GRIPPERVERT, SCRBS_HOT, L"HOT"}, + {SBP_GRIPPERVERT, SCRBS_PRESSED, L"PRESSED"}, + {SBP_GRIPPERVERT, SCRBS_DISABLED, L"DISABLED"}, + {SBP_GRIPPERVERT, SCRBS_HOVER, L"HOVER"}, {SBP_SIZEBOX, 0, L"SIZEBOX"}, {SBP_SIZEBOX, SZB_RIGHTALIGN, L"RIGHTALIGN"}, {SBP_SIZEBOX, SZB_LEFTALIGN, L"LEFTALIGN"}, + {SBP_SIZEBOX, SZB_TOPRIGHTALIGN, L"TOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_TOPLEFTALIGN, L"TOPLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMRIGHTALIGN, L"HALFBOTTOMRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFBOTTOMLEFTALIGN, L"HALFBOTTOMLEFTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPRIGHTALIGN, L"HALFTOPRIGHTALIGN"}, + {SBP_SIZEBOX, SZB_HALFTOPLEFTALIGN, L"HALFTOPLEFTALIGN"}, + {SBP_SIZEBOXBKGND, 0, L"SIZEBOXBKGND"}, {0, 0, L""} }; diff --git a/include/vsstyle.h b/include/vsstyle.h index 3075b4cdc08..b527c15a29a 100644 --- a/include/vsstyle.h +++ b/include/vsstyle.h @@ -1045,6 +1045,7 @@ enum SCROLLBARPARTS { SBP_GRIPPERHORZ = 8, SBP_GRIPPERVERT = 9, SBP_SIZEBOX = 10, + SBP_SIZEBOXBKGND = 11, }; #define SCROLLBARSTYLEPARTS SCROLLBARPARTS;

1 0

Zhiyi Zhang : uxtheme: Support parsing more rebar parts and states.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: f38d5b31444a01db32880b8903fdbfdf3ade172d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f38d5b31444a01db32880b89… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 6 15:56:27 2022 +0800 uxtheme: Support parsing more rebar parts and states. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/stylemap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index fa79c9d8840..2d8ea05bb5c 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -808,6 +808,18 @@ static const MSSTYLES_CLASS_MAP classRebar[] = { {RP_CHEVRON, CHEVS_HOT, L"HOT"}, {RP_CHEVRON, CHEVS_PRESSED, L"PRESSED"}, {RP_CHEVRONVERT, 0, L"CHEVRONVERT"}, + {RP_CHEVRONVERT, CHEVSV_NORMAL, L"NORMAL"}, + {RP_CHEVRONVERT, CHEVSV_HOT, L"HOT"}, + {RP_CHEVRONVERT, CHEVSV_PRESSED, L"PRESSED"}, + {RP_BACKGROUND, 0, L"BACKGROUND"}, + {RP_SPLITTER, 0, L"SPLITTER"}, + {RP_SPLITTER, SPLITS_NORMAL, L"NORMAL"}, + {RP_SPLITTER, SPLITS_HOT, L"HOT"}, + {RP_SPLITTER, SPLITS_PRESSED, L"PRESSED"}, + {RP_SPLITTERVERT, 0, L"SPLITTERVERT"}, + {RP_SPLITTERVERT, SPLITSV_NORMAL, L"NORMAL"}, + {RP_SPLITTERVERT, SPLITSV_HOT, L"HOT"}, + {RP_SPLITTERVERT, SPLITSV_PRESSED, L"PRESSED"}, {0, 0, L""} };

1 0

Paul Gofman : opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat().
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: cc8d8b5ee33561e984d4abe4112ddd6324f77115 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8d8b5ee33561e984d4abe4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 25 18:58:21 2022 -0500 opengl32: Prioritize stencil check over depth check in wglChoosePixelFormat(). Patch by Matteo Bruni. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/opengl32/wgl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index bd7f7d22e98..49f1e4700b4 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -564,27 +564,27 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) continue; } } - if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) + if (ppfd->cStencilBits) { - if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || - ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) + if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || + ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) goto found; - if (best.cDepthBits != format.cDepthBits) + if (best.cStencilBits != format.cStencilBits) { - TRACE( "depth mismatch for iPixelFormat=%d\n", i ); + TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); continue; } } - if (ppfd->cStencilBits) + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { - if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || - ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) + if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || + ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) goto found; - if (best.cStencilBits != format.cStencilBits) + if (best.cDepthBits != format.cDepthBits) { - TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); + TRACE( "depth mismatch for iPixelFormat=%d\n", i ); continue; } }

1 0

Biswapriyo Nath : include: Add IDXGIDebug1 declaration in dxgidebug.idl.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: 827839a6162360b8e4de8a058a64e939bdbd2126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=827839a6162360b8e4de8a05… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jun 18 02:11:40 2022 +0530 include: Add IDXGIDebug1 declaration in dxgidebug.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> --- include/dxgidebug.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/dxgidebug.idl b/include/dxgidebug.idl index 7806e0be013..686637321f0 100644 --- a/include/dxgidebug.idl +++ b/include/dxgidebug.idl @@ -244,3 +244,16 @@ interface IDXGIDebug : IUnknown [in] GUID apiid, [in] DXGI_DEBUG_RLO_FLAGS flags); } + +[ + uuid(c5a05f0c-16f2-4adf-9f4d-a8c4d58ac550), + object, + local, + pointer_default(unique) +] +interface IDXGIDebug1 : IDXGIDebug +{ + void EnableLeakTrackingForThread(); + void DisableLeakTrackingForThread(); + BOOL IsLeakTrackingEnabledForThread(); +}

1 0

Henri Verbeet : wined3d: Restore the vkd3d-shader version TRACE.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: wine Branch: master Commit: d4da8e313f53b969e3b56057739f0aaab49e97d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4da8e313f53b969e3b56057… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:17:10 2022 +0200 wined3d: Restore the vkd3d-shader version TRACE. This was lost in commit 24432a24d5e922cbd824b0af8f7b0c66ff2b66e8, but is useful, particularly when using external vkd3d-shader. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index cf07b81711e..14665dee0f2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1089,6 +1089,8 @@ static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(void) { + TRACE("Using %s.\n", vkd3d_shader_get_version(NULL, NULL)); + return &spirv_shader_backend_vk; }

1 0

Alexandre Julliard : vkd3d release 1.4
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: website Branch: master Commit: 00ea33b6f4fd5832c869590d0ad94fb82c7b94bb URL: https://source.winehq.org/git/website.git/?a=commit;h=00ea33b6f4fd5832c8695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 21:21:24 2022 +0200 vkd3d release 1.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022062201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022062201.xml b/news/en/2022062201.xml new file mode 100644 index 00000000..168cf06a --- /dev/null +++ b/news/en/2022062201.xml @@ -0,0 +1,17 @@ +<news> +<date>June 22, 2022</date> +<title>Vkd3d 1.4 Released</title> +<body> +The Wine team is proud to announce that release 1.4 of vkd3d, the +Direct3D to Vulkan translation library, is now available. + +This release contains improvements that are listed in the <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.4:/ANNOUNCE">release notes</a>. +The main highlights are: +<ul> + <li>Many improvements to the HLSL compiler.</li> + <li>A new descriptor heap implementation using the VK_EXT_descriptor_indexing extension.</li> + <li>A new fence implementation using the VK_KHR_timeline_semaphore extension.</li> +</ul> + +The source is <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.4.tar.xz">available here</a>. +</body></news>

1 0

Tag vkd3d-1.4 : Alexandre Julliard : Release 1.4
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: vkd3d Branch: refs/tags/vkd3d-1.4 Tag: d4c363c85d634d3d0700596c4a6929422c9e344b URL: https://source.winehq.org/git/vkd3d.git/?a=tag;h=d4c363c85d634d3d0700596c4a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 18:31:51 2022 +0200 Release 1.4

1 0

Henri Verbeet : vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: vkd3d Branch: master Commit: 4093fe49bfcd201a4f62b02c73b81bfcf5055e99 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4093fe49bfcd201a4f62b02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:09:01 2022 +0200 vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t. For example, when the input is an empty file. Leaving the source type as VKD3D_SHADER_SOURCE_NONE would cause (potential) subsequent get_source_type_info() calls to return NULL, resulting in a segmentation fault. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ab475617..9cb90cd5 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -663,11 +663,11 @@ int main(int argc, char **argv) { uint32_t token; - if (options.preprocess_only) + if (options.preprocess_only || info.source.size < sizeof(token)) { options.source_type = VKD3D_SHADER_SOURCE_HLSL; } - else if (info.source.size >= sizeof(token)) + else { memcpy(&token, info.source.code, sizeof(token)); if (token == TAG_DXBC)

1 0

Henri Verbeet : build: Add tests/vulkan_procs.h to the distribution.
by Alexandre Julliard June 22, 2022

June 22, 2022

Module: vkd3d Branch: master Commit: 2cad32d7fa87a277fa6cbcc6d1a54a747bae9caf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2cad32d7fa87a277fa6cbcc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 22 16:09:03 2022 +0200 build: Add tests/vulkan_procs.h to the distribution. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 0f10a56f..fe8133a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,7 +144,8 @@ vkd3d_test_headers = \ tests/d3d12_crosstest.h \ tests/d3d12_test_utils.h \ tests/shader_runner.h \ - tests/utils.h + tests/utils.h \ + tests/vulkan_procs.h vkd3d_demos = \ demos/vkd3d-gears \

1 0