April 2024 - Wine-commits - list.winehq.org

Conor McCarthy : vkd3d: Use Vulkan 1.1 if available.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: vkd3d Branch: master Commit: 270aa22d0b559cc4c38d7fd16786023d5c6b0b42 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/270aa22d0b559cc4c38d7fd167860… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 10 11:43:09 2024 +1000 vkd3d: Use Vulkan 1.1 if available. --- libs/vkd3d/device.c | 14 ++++++++++++++ libs/vkd3d/state.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 90de27c5..88bce198 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -558,12 +558,14 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_optional_instance_extensions_info *optional_extensions; const struct vkd3d_application_info *vkd3d_application_info; const struct vkd3d_host_time_domain_info *time_domain_info; + PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion; bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; char application_name[PATH_MAX]; uint32_t extension_count; const char **extensions; + uint32_t vk_api_version; VkInstance vk_instance; VkResult vr; HRESULT hr; @@ -616,6 +618,16 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.apiVersion = VK_API_VERSION_1_0; instance->api_version = VKD3D_API_VERSION_1_0; + /* vkEnumerateInstanceVersion was added in Vulkan 1.1, and its absence indicates only 1.0 is supported. */ + vkEnumerateInstanceVersion = (void *)vk_global_procs->vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + if (vkEnumerateInstanceVersion && vkEnumerateInstanceVersion(&vk_api_version) >= 0 + && vk_api_version >= VK_API_VERSION_1_1) + { + TRACE("Vulkan API version 1.1 is available; requesting it.\n"); + application_info.apiVersion = VK_API_VERSION_1_1; + } + instance->vk_api_version = application_info.apiVersion; + if ((vkd3d_application_info = vkd3d_find_struct(create_info->next, APPLICATION_INFO))) { if (vkd3d_application_info->application_name) @@ -5117,6 +5129,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->vk_info = instance->vk_info; device->signal_event = instance->signal_event; device->wchar_size = instance->wchar_size; + device->environment = (instance->vk_api_version >= VK_API_VERSION_1_1) + ? VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_1 : VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; device->adapter_luid = create_info->adapter_luid; device->removed_reason = S_OK; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b8328216..6ba29c18 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2452,7 +2452,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st memset(&target_info, 0, sizeof(target_info)); target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; - target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + target_info.environment = device->environment; target_info.extensions = device->vk_info.shader_extensions; target_info.extension_count = device->vk_info.shader_extension_count; @@ -3177,7 +3177,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; ps_target_info.next = NULL; ps_target_info.entry_point = "main"; - ps_target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + ps_target_info.environment = device->environment; ps_target_info.extensions = vk_info->shader_extensions; ps_target_info.extension_count = vk_info->shader_extension_count; ps_target_info.parameters = ps_shader_parameters; @@ -3207,7 +3207,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s memset(&target_info, 0, sizeof(target_info)); target_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SPIRV_TARGET_INFO; - target_info.environment = VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0; + target_info.environment = device->environment; target_info.extensions = vk_info->shader_extensions; target_info.extension_count = vk_info->shader_extension_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8de57a33..43a4acfa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -185,6 +185,7 @@ struct vkd3d_instance struct vkd3d_vulkan_info vk_info; struct vkd3d_vk_global_procs vk_global_procs; void *libvulkan; + uint32_t vk_api_version; uint64_t config_flags; enum vkd3d_api_version api_version; @@ -1678,6 +1679,7 @@ struct d3d12_device struct vkd3d_vk_device_procs vk_procs; PFN_vkd3d_signal_event signal_event; size_t wchar_size; + enum vkd3d_shader_spirv_environment environment; struct vkd3d_gpu_va_allocator gpu_va_allocator;

1 0

Conor McCarthy : vkd3d-shader: Introduce a wave ops feature flag.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: vkd3d Branch: master Commit: b0145ad96e65e2f6521804103a81de2a90df1174 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b0145ad96e65e2f6521804103a81d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Dec 18 19:09:34 2023 +1000 vkd3d-shader: Introduce a wave ops feature flag. --- include/vkd3d_shader.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a5b11bd6..2b32b8a3 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -215,6 +215,15 @@ enum vkd3d_shader_compile_option_feature_flags * This corresponds to the "shaderFloat64" feature in the Vulkan API, and * the "GL_ARB_gpu_shader_fp64" extension in the OpenGL API. */ VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64 = 0x00000002, + /** The SPIR-V target environment supports wave operations. + * This flag is valid only in VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_1 + * or greater, and corresponds to the following minimum requirements in + * VkPhysicalDeviceSubgroupProperties: + * - subgroupSize >= 4. + * - supportedOperations has BASIC, VOTE, ARITHMETIC, BALLOT, SHUFFLE and + * QUAD bits set. + * - supportedStages include COMPUTE and FRAGMENT. \since 1.12 */ + VKD3D_SHADER_COMPILE_OPTION_FEATURE_WAVE_OPS = 0x00000004, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS), };

1 0

Conor McCarthy : tests: Add UNORM formats B5G6R5, B5G5R5A1 and B4G4R4A4 to the UAV image clear tests.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: vkd3d Branch: master Commit: 6205d96c3b60493ebdfb48643e51cfb33cb5065d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6205d96c3b60493ebdfb48643e51c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 15 13:51:47 2024 +1000 tests: Add UNORM formats B5G6R5, B5G5R5A1 and B4G4R4A4 to the UAV image clear tests. --- tests/d3d12.c | 40 ++++++++++++++++++++++++++++++++++++++-- tests/d3d12_test_utils.h | 4 ++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 31f57c40..61f6f05e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -534,6 +534,20 @@ static bool is_vs_array_index_supported(ID3D12Device *device) return options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation; } +static bool is_typed_uav_format_supported(ID3D12Device *device, DXGI_FORMAT format) +{ + D3D12_FEATURE_DATA_FORMAT_SUPPORT format_support = {0}; + HRESULT hr; + + format_support.Format = format; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, + &format_support, sizeof(format_support)); + todo + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + return format_support.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -5665,13 +5679,13 @@ static void test_clear_unordered_access_view_buffer(void) static void test_clear_unordered_access_view_image(void) { + unsigned int image_size, image_depth, texel_size; unsigned int expected_colour, actual_colour; D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; ID3D12DescriptorHeap *cpu_heap, *gpu_heap; ID3D12GraphicsCommandList *command_list; unsigned int i, j, d, p, x, y, z, layer; D3D12_HEAP_PROPERTIES heap_properties; - unsigned int image_size, image_depth; struct d3d12_resource_readback rb; D3D12_RESOURCE_DESC resource_desc; struct test_context_desc desc; @@ -5699,6 +5713,7 @@ static void test_clear_unordered_access_view_image(void) unsigned int expected; bool is_float; bool is_todo; + bool check_support; } tests[] = { @@ -5735,6 +5750,9 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, + {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00000843, false, true}, + {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00008443, false, true}, + {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00001123, false, true, true}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3e800000 /* 0.25f */, 0x3f800000 /* 1.0f */, 0, 0}, 0xffff4000, true}, @@ -5747,6 +5765,15 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 1.0f */, 0 /* 0.0f */, 0xbf800000 /* -1.0f */, 0x3f000000 /* 1.0f */}, 0x00000380, true}, + {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* -1.0f */, 0}, + 0x87ff, true, true}, + {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, + {0x3f000000 /* 0.5f */, 0x3e800000 /* 0.25f */, 0x3e000000 /* 0.125f */, 0x3f800000 /* 1.0f */}, + 0xc104, true, true}, + {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, + {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0x40000000 /* -1.0f */}, + 0xf8ff, true, true, true}, }; static const struct @@ -5785,6 +5812,12 @@ static void test_clear_unordered_access_view_image(void) if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered) continue; + if (tests[i].check_support && !is_typed_uav_format_supported(device, tests[i].format)) + { + skip("Device does not support format %#x; skipping.\n", tests[i].format); + continue; + } + vkd3d_test_push_context("Dim %u, Test %u", d, i); is_1d = uav_dimensions[d].resource_dim == D3D12_RESOURCE_DIMENSION_TEXTURE1D; @@ -5813,6 +5846,8 @@ static void test_clear_unordered_access_view_image(void) uav_desc.Format = tests[i].format; uav_desc.ViewDimension = uav_dimensions[d].view_dim; + texel_size = format_size(uav_desc.Format); + for (j = 0; j < 2; ++j) { unsigned int first_layer = j ? 0 : tests[i].first_layer; @@ -5920,7 +5955,8 @@ static void test_clear_unordered_access_view_image(void) && layer < tests[i].first_layer + tests[i].layer_count; expected_colour = is_inside ? tests[i].expected : clear_value[0]; - actual_colour = get_readback_uint(&rb.rb, x, y, z); + actual_colour = (texel_size == 2) ? get_readback_uint16(&rb.rb, x, y) + : get_readback_uint(&rb.rb, x, y, z); success = compare_color(actual_colour, expected_colour, tests[i].is_float ? 1 : 0); todo_if(tests[i].is_todo && expected_colour) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 85747297..77b9d42e 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -357,6 +357,10 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_BC4_UNORM: case DXGI_FORMAT_BC4_SNORM: return 8; + case DXGI_FORMAT_B5G6R5_UNORM: + case DXGI_FORMAT_B5G5R5A1_UNORM: + case DXGI_FORMAT_B4G4R4A4_UNORM: + return 2; default: trace("Unhandled format %#x.\n", format);

1 0

Conor McCarthy : vkd3d: Support DXGI_FORMAT_B5G6R5_UNORM.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: vkd3d Branch: master Commit: 4cdf38d3922c601ba70bbe0e7d71fdddb4440e0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4cdf38d3922c601ba70bbe0e7d71f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 15 13:58:30 2024 +1000 vkd3d: Support DXGI_FORMAT_B5G6R5_UNORM. --- libs/vkd3d/command.c | 6 ++++++ libs/vkd3d/utils.c | 1 + tests/d3d12.c | 5 ++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7115a74a..2b3f2869 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5414,6 +5414,12 @@ static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12 | ((colour->uint32[2] & 0x3ff) << 22); return vkd3d_get_format(device, DXGI_FORMAT_R32_UINT, false); + case DXGI_FORMAT_B5G6R5_UNORM: + colour->uint32[0] = (colour->uint32[2] & 0x1f) + | ((colour->uint32[1] & 0x3f) << 5) + | ((colour->uint32[0] & 0x1f) << 11); + return vkd3d_get_format(device, DXGI_FORMAT_R16_UINT, false); + default: return NULL; } diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ac79ae5d..c62dc55a 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -87,6 +87,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR, 1, SINT}, {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B5G6R5_UNORM, VK_FORMAT_R5G6B5_UNORM_PACK16, 2, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1, TYPELESS}, diff --git a/tests/d3d12.c b/tests/d3d12.c index 61f6f05e..dcb4a638 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -954,7 +954,6 @@ static void test_check_feature_support(void) is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP || format == DXGI_FORMAT_R8G8_B8G8_UNORM || format == DXGI_FORMAT_G8R8_G8B8_UNORM - || format == DXGI_FORMAT_B5G6R5_UNORM || format == DXGI_FORMAT_B5G5R5A1_UNORM || format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM || (DXGI_FORMAT_AYUV <= format && format <= DXGI_FORMAT_B4G4R4A4_UNORM); @@ -5750,7 +5749,7 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, 1, 0, 0, 1, 0, {}, {0x123, 0, 0, 0}, 0x00000023, false, true}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, - {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00000843, false, true}, + {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00000843}, {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00008443, false, true}, {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00001123, false, true, true}, /* Test float clears with formats. */ @@ -5767,7 +5766,7 @@ static void test_clear_unordered_access_view_image(void) 0x00000380, true}, {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* -1.0f */, 0}, - 0x87ff, true, true}, + 0x87ff, true}, {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3e800000 /* 0.25f */, 0x3e000000 /* 0.125f */, 0x3f800000 /* 1.0f */}, 0xc104, true, true},

1 0

Conor McCarthy : vkd3d: Support DXGI_FORMAT_B5G5R5A1_UNORM.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: vkd3d Branch: master Commit: 88795216796882fab4bdfa2d73f664dcc4c2d022 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/88795216796882fab4bdfa2d73f66… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 15 14:01:42 2024 +1000 vkd3d: Support DXGI_FORMAT_B5G5R5A1_UNORM. --- libs/vkd3d/command.c | 7 +++++++ libs/vkd3d/utils.c | 1 + tests/d3d12.c | 5 ++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2b3f2869..6df00a22 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5420,6 +5420,13 @@ static const struct vkd3d_format *vkd3d_fixup_clear_uav_uint_colour(struct d3d12 | ((colour->uint32[0] & 0x1f) << 11); return vkd3d_get_format(device, DXGI_FORMAT_R16_UINT, false); + case DXGI_FORMAT_B5G5R5A1_UNORM: + colour->uint32[0] = (colour->uint32[2] & 0x1f) + | ((colour->uint32[1] & 0x1f) << 5) + | ((colour->uint32[0] & 0x1f) << 10) + | ((colour->uint32[3] & 0x1) << 15); + return vkd3d_get_format(device, DXGI_FORMAT_R16_UINT, false); + default: return NULL; } diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index c62dc55a..6796c08c 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -88,6 +88,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR, 1, SINT}, {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B5G6R5_UNORM, VK_FORMAT_R5G6B5_UNORM_PACK16, 2, 1, 1, 1, COLOR, 1}, + {DXGI_FORMAT_B5G5R5A1_UNORM, VK_FORMAT_A1R5G5B5_UNORM_PACK16, 2, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR, 1, TYPELESS}, diff --git a/tests/d3d12.c b/tests/d3d12.c index dcb4a638..319b4594 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -954,7 +954,6 @@ static void test_check_feature_support(void) is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP || format == DXGI_FORMAT_R8G8_B8G8_UNORM || format == DXGI_FORMAT_G8R8_G8B8_UNORM - || format == DXGI_FORMAT_B5G5R5A1_UNORM || format == DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM || (DXGI_FORMAT_AYUV <= format && format <= DXGI_FORMAT_B4G4R4A4_UNORM); @@ -5750,7 +5749,7 @@ static void test_clear_unordered_access_view_image(void) {DXGI_FORMAT_R8G8B8A8_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x04030201}, {DXGI_FORMAT_R11G11B10_FLOAT, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00c01001}, {DXGI_FORMAT_B5G6R5_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 4}, 0x00000843}, - {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00008443, false, true}, + {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00008443}, {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, {1, 2, 3, 1}, 0x00001123, false, true, true}, /* Test float clears with formats. */ {DXGI_FORMAT_R16G16_UNORM, 1, 1, 0, 0, 1, 0, {}, @@ -5769,7 +5768,7 @@ static void test_clear_unordered_access_view_image(void) 0x87ff, true}, {DXGI_FORMAT_B5G5R5A1_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3e800000 /* 0.25f */, 0x3e000000 /* 0.125f */, 0x3f800000 /* 1.0f */}, - 0xc104, true, true}, + 0xc104, true}, {DXGI_FORMAT_B4G4R4A4_UNORM, 1, 1, 0, 0, 1, 0, {}, {0x3f000000 /* 0.5f */, 0x3f800000 /* 1.0f */, 0x40000000 /* 2.0f */, 0x40000000 /* -1.0f */}, 0xf8ff, true, true, true},

1 0

Vijay Kiran Kamuju : netapi32: Add NetRemoteTOD stub.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: wine Branch: master Commit: f42391b52caeb93a5aac9bb7a7c0647984873420 URL: https://gitlab.winehq.org/wine/wine/-/commit/f42391b52caeb93a5aac9bb7a7c064… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Mar 21 22:38:30 2024 +0100 netapi32: Add NetRemoteTOD stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56369 --- dlls/netapi32/netapi32.c | 12 ++++++++++++ dlls/netapi32/netapi32.spec | 2 +- dlls/srvcli/srvcli.spec | 2 +- include/Makefile.in | 1 + include/lmremutl.h | 47 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index 1cc36591ea4..56da0cd640b 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -36,6 +36,7 @@ #include "atsvc.h" #include "lmapibuf.h" #include "lmbrowsr.h" +#include "lmremutl.h" #include "lmshare.h" #include "lmwksta.h" #include "netbios.h" @@ -2584,6 +2585,17 @@ NET_API_STATUS WINAPI NetLocalGroupSetMembers( return NERR_Success; } +/************************************************************ + * NetRemoteTOD (NETAPI32.@) + */ +NET_API_STATUS NET_API_FUNCTION NetRemoteTOD( + LPCWSTR servername, + LPBYTE *buf) +{ + FIXME("(%s %p) stub!\n", debugstr_w(servername), buf); + return ERROR_NO_BROWSER_SERVERS_FOUND; +} + /************************************************************ * DavGetHTTPFromUNCPath (NETAPI32.@) */ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 7e83b1afe70..4e19c3c53ba 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -124,7 +124,7 @@ @ stub NetMessageNameGetInfo @ stdcall NetQueryDisplayInformation(wstr long long long long ptr ptr) @ stub NetRemoteComputerSupports -@ stub NetRemoteTOD +@ stdcall NetRemoteTOD(wstr ptr) @ stub NetReplExportDirAdd @ stub NetReplExportDirDel @ stub NetReplExportDirEnum diff --git a/dlls/srvcli/srvcli.spec b/dlls/srvcli/srvcli.spec index 821724a7d4d..2a6ddd749e5 100644 --- a/dlls/srvcli/srvcli.spec +++ b/dlls/srvcli/srvcli.spec @@ -27,7 +27,7 @@ @ stub NetFileClose @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) netapi32.NetFileEnum @ stub NetFileGetInfo -@ stub NetRemoteTOD +@ stdcall NetRemoteTOD(wstr ptr) netapi32.NetRemoteTOD @ stub NetServerAliasAdd @ stub NetServerAliasDel @ stub NetServerAliasEnum diff --git a/include/Makefile.in b/include/Makefile.in index c527a17cec4..80c380d993c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -408,6 +408,7 @@ SOURCES = \ lmerr.h \ lmjoin.h \ lmmsg.h \ + lmremutl.h \ lmserver.h \ lmshare.h \ lmstats.h \ diff --git a/include/lmremutl.h b/include/lmremutl.h new file mode 100644 index 00000000000..914e7811486 --- /dev/null +++ b/include/lmremutl.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2024 Vijay Kiran Kamuju + * + * 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 + */ +#ifndef _LMREMUTL_H +#define _LMREMUTL_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _TIME_OF_DAY_INFO +{ + DWORD tod_elapsedt; + DWORD tod_msecs; + DWORD tod_hours; + DWORD tod_mins; + DWORD tod_secs; + DWORD tod_hunds; + DWORD tod_timezone; + DWORD tod_tinterval; + DWORD tod_day; + DWORD tod_month; + DWORD tod_year; + DWORD tod_weekday; +} TIME_OF_DAY_INFO, *PTIME_OF_DAY_INFO, *LPTIME_OF_DAY_INFO; + +NET_API_STATUS NET_API_FUNCTION NetRemoteTOD(LPCWSTR,LPBYTE*); + +#ifdef __cplusplus +} +#endif + +#endif /* _LMREMUTL_H */

1 0

Isaac Marovitz : ntdll: Implement NtQueueApcThreadEx().
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: wine Branch: master Commit: d821ddaa2040d965c9902f5c21ce843125a7f78e URL: https://gitlab.winehq.org/wine/wine/-/commit/d821ddaa2040d965c9902f5c21ce84… Author: Isaac Marovitz <isaacryu(a)icloud.com> Date: Sat Apr 13 14:15:10 2024 -0400 ntdll: Implement NtQueueApcThreadEx(). --- dlls/ntdll/ntdll.spec | 2 + dlls/ntdll/ntsyscalls.h | 320 ++++++++++++++++++++++---------------------- dlls/ntdll/signal_arm64ec.c | 7 + dlls/ntdll/unix/thread.c | 11 ++ dlls/wow64/process.c | 17 +++ include/winternl.h | 1 + 6 files changed, 199 insertions(+), 159 deletions(-)

1 0

Paul Gofman : ntdll: Return STATUS_NO_YIELD_PERFORMED from NtYieldExecution() on Linux if no yield was performed.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: wine Branch: master Commit: 146c2631276b3e826085a6d270d71c5f56b75d87 URL: https://gitlab.winehq.org/wine/wine/-/commit/146c2631276b3e826085a6d270d71c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 5 12:11:51 2024 -0600 ntdll: Return STATUS_NO_YIELD_PERFORMED from NtYieldExecution() on Linux if no yield was performed. --- dlls/ntdll/unix/sync.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index ae7bc115ffe..e070233104b 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -43,6 +43,9 @@ #ifdef HAVE_SCHED_H # include <sched.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -1514,7 +1517,17 @@ NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait, NTSTATUS WINAPI NtYieldExecution(void) { #ifdef HAVE_SCHED_YIELD +#ifdef RUSAGE_THREAD + struct rusage u1, u2; + int ret; + + ret = getrusage( RUSAGE_THREAD, &u1 ); +#endif sched_yield(); +#ifdef RUSAGE_THREAD + if (!ret) ret = getrusage( RUSAGE_THREAD, &u2 ); + if (!ret && u1.ru_nvcsw == u2.ru_nvcsw && u1.ru_nivcsw == u2.ru_nivcsw) return STATUS_NO_YIELD_PERFORMED; +#endif return STATUS_SUCCESS; #else return STATUS_NO_YIELD_PERFORMED;

1 0

Piotr Caban : gdiplus: Fix IWICBitmapFrameDecode reference leak in decode_frame_wic.
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: wine Branch: master Commit: bf12d17b48577b055e6d9d67d8d2148612890c43 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf12d17b48577b055e6d9d67d8d214… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 17 19:09:07 2024 +0200 gdiplus: Fix IWICBitmapFrameDecode reference leak in decode_frame_wic. --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 806da0cb696..d3d4ec7de42 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3930,8 +3930,8 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi } palette = get_palette(frame, palette_type); - IWICBitmapFrameDecode_Release(frame); } + IWICBitmapFrameDecode_Release(frame); } if (FAILED(hr) && status == Ok) status = hresult_to_status(hr);

1 0

Conor McCarthy : tests/hlsl: Add tests for GetSamplePosition() and GetSampleCount().
by Alexandre Julliard 17 Apr '24

17 Apr '24

Module: vkd3d Branch: master Commit: 696fc120613114638535a71d47b300f1589a1cb3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/696fc120613114638535a71d47b30… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 10 13:51:06 2024 +1000 tests/hlsl: Add tests for GetSamplePosition() and GetSampleCount(). --- Makefile.am | 2 ++ tests/d3d12_test_utils.h | 10 +++--- tests/hlsl/get-sample-pos.shader_test | 19 +++++++++++ tests/hlsl/rt-get-sample-info.shader_test | 34 ++++++++++++++++++++ tests/shader_runner.c | 35 +++++++++++++++++---- tests/shader_runner.h | 4 +++ tests/shader_runner_d3d11.c | 52 ++++++++++++++++++++++++++----- tests/shader_runner_d3d12.c | 42 ++++++++++++++++++------- tests/shader_runner_gl.c | 24 +++++++++++--- 9 files changed, 188 insertions(+), 34 deletions(-)

1 0