December 2018 - Wine-Commits

Józef Kucia : tests: Fix --warp command line option.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 0be448b4fd05eebcfef0e9f08ae2eafbb45e8c06 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0be448b4fd05eebcfef0e9f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:00 2018 +0100 tests: Fix --warp command line option. 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> --- tests/d3d12_crosstest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 94aa4e5..00db064 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -254,7 +254,7 @@ static IUnknown *create_adapter(void) hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); - if (use_warp_device && !(adapter = create_warp_adapter(factory))) + if (use_warp_device && (adapter = create_warp_adapter(factory))) { IDXGIFactory4_Release(factory); return adapter;

1 0

Józef Kucia : tests: Introduce vkd3d_test_set_context ().
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: d0f6d8131a9f966c88aa6b926ca0eddcfe6a82c7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0f6d8131a9f966c88aa6b9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:47:57 2018 +0100 tests: Introduce vkd3d_test_set_context(). Useful for table-based tests. 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_test.h | 31 +++++++++++++++++++++++++------ tests/d3d12.c | 3 +++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index a2649dd..ccc5350 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -93,6 +93,8 @@ static struct unsigned int todo_level; bool todo_do_loop; + + char context[1024]; } vkd3d_test_state; static bool @@ -116,13 +118,13 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg { if (result) { - printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_success_count); } else { - printf("%s:%d: Todo: ", vkd3d_test_name, line); + printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_count); } @@ -130,12 +132,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg else if (result) { if (vkd3d_test_state.debug_level > 1) - printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line); + printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); InterlockedIncrement(&vkd3d_test_state.success_count); } else { - printf("%s:%d: Test failed: ", vkd3d_test_name, line); + printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.failure_count); } @@ -156,7 +158,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d: Test skipped: ", vkd3d_test_name, line); + printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); va_end(args); InterlockedIncrement(&vkd3d_test_state.skip_count); @@ -167,7 +169,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d: ", vkd3d_test_name, line); + printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); va_end(args); } @@ -304,6 +306,23 @@ static inline void vkd3d_test_end_todo(void) vkd3d_test_state.todo_level >>= 1; } +static inline void vkd3d_test_set_context(const char *fmt, ...) +{ + va_list args; + + if (!fmt) + { + vkd3d_test_state.context[0] = '\0'; + return; + } + + vkd3d_test_state.context[0] = ':'; + va_start(args, fmt); + vsnprintf(&vkd3d_test_state.context[1], sizeof(vkd3d_test_state.context) - 1, fmt, args); + va_end(args); + vkd3d_test_state.context[sizeof(vkd3d_test_state.context) - 1] = '\0'; +} + #define run_test(test_pfn) \ vkd3d_run_test(#test_pfn, test_pfn) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1598910..0330863 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18734,6 +18734,8 @@ static void test_instance_id(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + layout_desc[1].InstanceDataStepRate = tests[i].color_step_rate; input_layout.pInputElementDescs = layout_desc; input_layout.NumElements = ARRAY_SIZE(layout_desc); @@ -18784,6 +18786,7 @@ static void test_instance_id(void) ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; } + vkd3d_test_set_context(NULL); ID3D12CommandSignature_Release(command_signature); ID3D12Resource_Release(argument_buffer);

1 0

Józef Kucia : vkd3d: Avoid out-of-bounds array access in d3d12_device_CopyDescriptors().
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: b868b5a258db190c2aafc8cda8de31528b08972e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b868b5a258db190c2aafc8c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 6 15:28:35 2018 +0100 vkd3d: Avoid out-of-bounds array access in d3d12_device_CopyDescriptors(). 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/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9e36828..5bcfc29 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1993,13 +1993,14 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, { dst_idx = 0; ++dst_range_idx; + + if (dst_range_idx >= dst_descriptor_range_count) + return; + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } - if (dst_range_idx >= dst_descriptor_range_count) - break; - d3d12_desc_copy(dst++, src++, device); ++dst_idx;

1 0

Józef Kucia : vkd3d-shader: Avoid BOOL.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: a7aaa09eb3c6d6247e1a0f94ee84589a3f687cd1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a7aaa09eb3c6d6247e1a0f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:04 2018 +0100 vkd3d-shader: Avoid BOOL. 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/dxbc.c | 48 ++++++++++++++++---------------- libs/vkd3d-shader/trace.c | 12 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 3 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a7aaa09eb3c6d6247e1…

1 0

Józef Kucia : vkd3d: Return E_FAIL for invalid shader bytecode.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 6bcee199606ca051f099d0de32d3e1554f13d2df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6bcee199606ca051f099d0d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:03 2018 +0100 vkd3d: Return E_FAIL for invalid shader bytecode. On Windows invalid shader bytecode leads to a crash, E_FAIL or E_OUTOFMEMORY error. 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/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index b7ebbdd..fc09bf9 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -423,12 +423,14 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) { case VKD3D_OK: return S_OK; + case VKD3D_ERROR_INVALID_SHADER: + WARN("Invalid shader bytecode.\n"); + /* fall-through */ case VKD3D_ERROR: return E_FAIL; case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: - case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL;

1 0

Józef Kucia : tests: Add test for invalid shader bytecode.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: e9b33183cf68d21c5ceb504208406cc7a5fb0ef1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e9b33183cf68d21c5ceb504… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:02 2018 +0100 tests: Add test for invalid shader bytecode. 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> --- Makefile.am | 4 +++- tests/.gitignore | 6 +++-- tests/vkd3d_shader_api.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 86c0184..a16f7ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,8 @@ vkd3d_demos_shaders = \ demos/triangle_vs.h vkd3d_tests = \ - tests/vkd3d_api + tests/vkd3d_api \ + tests/vkd3d_shader_api vkd3d_cross_tests = \ tests/d3d12 \ @@ -137,6 +138,7 @@ AM_DEFAULT_SOURCE_EXT = .c TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/tests/.gitignore b/tests/.gitignore index 87d1ea6..24258bf 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,2 +1,4 @@ -d3d12 -vkd3d_api +/d3d12 +/d3d12_invalid_usage +/vkd3d_api +/vkd3d_shader_api diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c new file mode 100644 index 0000000..ec439e1 --- /dev/null +++ b/tests/vkd3d_shader_api.c @@ -0,0 +1,58 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_test.h" +#include <vkd3d_shader.h> + +static void test_invalid_shaders(void) +{ + struct vkd3d_shader_code spirv; + int rc; + + static const DWORD ps_break_code[] = + { +#if 0 + ps_4_0 + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + if_z cb0[0].x + mov o0.xyzw, l(1.000000,1.000000,1.000000,1.000000) + break + endif + mov o0.xyzw, l(0,0,0,0) + ret +#endif + 0x43425844, 0x1316702a, 0xb1a7ebfc, 0xf477753e, 0x72605647, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000080, 0x00000040, 0x00000020, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400001f, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x3f800000, 0x3f800000, 0x3f800000, 0x01000002, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vkd3d_shader_code ps_break = {ps_break_code, sizeof(ps_break_code)}; + + rc = vkd3d_shader_compile_dxbc(&ps_break, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); +} + +START_TEST(vkd3d_shader_api) +{ + run_test(test_invalid_shaders); +}

1 0

Józef Kucia : tests: Add names for shader instruction tests.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: c090602e0a6042475f393c84f46c942478c3b6f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c090602e0a6042475f393c8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:47:58 2018 +0100 tests: Add names for shader instruction tests. 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> --- tests/d3d12.c | 153 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 86 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c090602e0a6042475f3…

1 0

Józef Kucia : tests: Detect when WARP is used.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: f359108658b6435859d2cb9a8b25f2a8f6adb9fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f359108658b6435859d2cb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:47:59 2018 +0100 tests: Detect when WARP is used. 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> --- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 10 ++++++++-- tests/d3d12_invalid_usage.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9ec71f4..c127f6b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21833,7 +21833,7 @@ START_TEST(d3d12) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_create_device); run_test(test_node_count); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ececd78..94aa4e5 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -267,7 +267,7 @@ static IUnknown *create_adapter(void) return adapter; } -static void print_adapter_info(void) +static void init_adapter_info(void) { IDXGIAdapter *dxgi_adapter; DXGI_ADAPTER_DESC desc; @@ -286,6 +286,12 @@ static void print_adapter_info(void) trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + if (desc.VendorId == 0x1414 && desc.DeviceId == 0x008c) + { + trace("Using WARP device.\n"); + use_warp_device = true; + } + IDXGIAdapter_Release(dxgi_adapter); } #else @@ -294,7 +300,7 @@ static IUnknown *create_adapter(void) return NULL; } -static void print_adapter_info(void) {} +static void init_adapter_info(void) {} #endif static ID3D12Device *create_device(void) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 5f764eb..940dea9 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -154,7 +154,7 @@ START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_invalid_texture_resource_barriers); }

1 0

Józef Kucia : tests: Skip "ps_movc" on Windows AMD drivers.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 56f79913f6f2e7e629865b7628cb7ac183561cab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=56f79913f6f2e7e629865b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:01 2018 +0100 tests: Skip "ps_movc" on Windows AMD drivers. 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> --- tests/d3d12.c | 6 ++++++ tests/d3d12_crosstest.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c127f6b..463e304 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7986,6 +7986,12 @@ static void test_shader_instructions(void) continue; } + if (uint_tests[i].ps == &ps_movc && is_amd_device(context.device)) + { + skip("ps_movc crashes on Windows with AMD GPUs.\n"); + continue; + } + if (current_ps != uint_tests[i].ps) { if (context.pipeline_state) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 00db064..ee12c89 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -294,6 +294,32 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } + +static inline bool is_amd_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc = {0}; + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + HRESULT hr; + LUID luid; + + luid = ID3D12Device_GetAdapterLuid(device); + + hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); + + hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter_GetDesc(adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory4_Release(factory); + + return desc.VendorId == 0x1002; +} #else static IUnknown *create_adapter(void) { @@ -301,6 +327,11 @@ static IUnknown *create_adapter(void) } static void init_adapter_info(void) {} + +static inline bool is_amd_device(ID3D12Device *device) +{ + return false; +} #endif static ID3D12Device *create_device(void)

1 0

Józef Kucia : vkd3d-shader: Avoid BYTE.
by Alexandre Julliard Dec. 12, 2018

Dec. 12, 2018

Module: vkd3d Branch: master Commit: 4e66897a1efe9316f853febcad669876595611aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4e66897a1efe9316f853feb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 11 15:48:05 2018 +0100 vkd3d-shader: Avoid BYTE. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cf6e9f5..afa002b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -545,8 +545,8 @@ enum vkd3d_shader_type struct vkd3d_shader_version { enum vkd3d_shader_type type; - BYTE major; - BYTE minor; + uint8_t major; + uint8_t minor; }; struct vkd3d_shader_immediate_constant_buffer

1 0