wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Nikolay Sivov : d3dcompiler: Set correct compilation target for effects profiles.
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: d01ae1512fe0f0b4288a97b38cf888095159b919 URL: https://gitlab.winehq.org/wine/wine/-/commit/d01ae1512fe0f0b4288a97b38cf888… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 10 11:10:34 2024 +0100 d3dcompiler: Set correct compilation target for effects profiles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 77 +++++++++++++++++++++++++----------------- dlls/d3dx9_36/tests/effect.c | 11 +----- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ded52bad965..c1940e8d888 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -397,29 +397,12 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } -HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, - const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entry_point, - const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, - const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader_blob, - ID3DBlob **messages_blob) +static enum vkd3d_shader_target_type get_target_for_profile(const char *profile) { - struct d3dcompiler_include_from_file include_from_file; - struct vkd3d_shader_preprocess_info preprocess_info; - struct vkd3d_shader_hlsl_source_info hlsl_info; - struct vkd3d_shader_compile_option options[4]; - struct vkd3d_shader_compile_info compile_info; - struct vkd3d_shader_compile_option *option; - struct vkd3d_shader_code byte_code; - const D3D_SHADER_MACRO *macro; size_t profile_len, i; - char *messages; - HRESULT hr; - int ret; static const char * const d3dbc_profiles[] = { - "fx_2_", - "ps.1.", "ps.2.", "ps.3.", @@ -439,6 +422,50 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen "tx_1_", }; + static const char * const fx_profiles[] = + { + "fx_2_0", + "fx_4_0", + "fx_4_1", + "fx_5_0", + }; + + profile_len = strlen(profile); + for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) + { + size_t len = strlen(d3dbc_profiles[i]); + + if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) + return VKD3D_SHADER_TARGET_D3D_BYTECODE; + } + + for (i = 0; i < ARRAY_SIZE(fx_profiles); ++i) + { + if (!strcmp(profile, fx_profiles[i])) + return VKD3D_SHADER_TARGET_FX; + } + + return VKD3D_SHADER_TARGET_DXBC_TPF; +} + +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entry_point, + const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader_blob, + ID3DBlob **messages_blob) +{ + struct d3dcompiler_include_from_file include_from_file; + struct vkd3d_shader_preprocess_info preprocess_info; + struct vkd3d_shader_hlsl_source_info hlsl_info; + struct vkd3d_shader_compile_option options[4]; + struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_compile_option *option; + struct vkd3d_shader_code byte_code; + const D3D_SHADER_MACRO *macro; + char *messages; + HRESULT hr; + int ret; + TRACE("data %p, data_size %Iu, filename %s, macros %p, include %p, entry_point %s, " "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " "secondary_data_size %Iu, shader_blob %p, messages_blob %p.\n", @@ -477,24 +504,12 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen compile_info.source.code = data; compile_info.source.size = data_size; compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; - compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; + compile_info.target_type = get_target_for_profile(profile); compile_info.options = options; compile_info.option_count = 1; compile_info.log_level = VKD3D_SHADER_LOG_INFO; compile_info.source_name = filename; - profile_len = strlen(profile); - for (i = 0; i < ARRAY_SIZE(d3dbc_profiles); ++i) - { - size_t len = strlen(d3dbc_profiles[i]); - - if (len <= profile_len && !memcmp(profile, d3dbc_profiles[i], len)) - { - compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE; - break; - } - } - preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; preprocess_info.next = &hlsl_info; preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 5420501c92f..0e7028f38b6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -257,12 +257,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %lx, expected 0 (D3D_OK)\n", hr); hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); - todo_wine ok(hr == D3D_OK, "Got result %lx, expected 0 (D3D_OK)\n", hr); - if (FAILED(hr)) - { - skip("Failed to compile effect, skipping test.\n"); - return; - } + ok(hr == D3D_OK, "Got result %lx, expected 0 (D3D_OK)\n", hr); hr = effect->lpVtbl->QueryInterface(effect, &IID_ID3DXBaseEffect, (void **)&base); ok(hr == E_NOINTERFACE, "QueryInterface failed, got %lx, expected %lx (E_NOINTERFACE)\n", hr, E_NOINTERFACE); @@ -8041,15 +8036,12 @@ static void test_create_effect_from_file(void) /* This is apparently broken on native, it ends up using the wrong include. */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, 0, NULL, &effect, &messages); - todo_wine ok(hr == E_FAIL, "Unexpected error, hr %#lx.\n", hr); if (messages) { trace("D3DXCreateEffectFromFileExW messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); ID3DXBuffer_Release(messages); } - if (effect) - effect->lpVtbl->Release(effect); delete_file("effect1.fx"); delete_file("effect2.fx"); @@ -8067,7 +8059,6 @@ static void test_create_effect_from_file(void) * is "ID3DXEffectCompiler: There were no techniques" */ hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, &include.ID3DXInclude_iface, NULL, 0, NULL, &effect, &messages); - todo_wine ok(hr == E_FAIL, "D3DXInclude test failed with error %#lx.\n", hr); if (messages) {

1 0

Zhiyi Zhang : mfreadwrite: Fix a memory leak (Coverity).
by Alexandre Julliard 12 Mar '24

12 Mar '24

Module: wine Branch: master Commit: e21244f7a3ecc6458ea426172a8096341b626e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/e21244f7a3ecc6458ea426172a8096… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Mar 11 20:51:09 2024 +0800 mfreadwrite: Fix a memory leak (Coverity). --- dlls/mfreadwrite/reader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 5cd4641a0d4..5538739fe6b 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1925,7 +1925,10 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, allow_processor ? NULL : &out_type, NULL, &classes, &count))) { if (!count) + { + free(entry); return MF_E_TOPO_CODEC_NOT_FOUND; + } for (i = 0; i < count; i++) {

1 0

Evan Tang : vkd3d: Enable VK_EXT_fragment_shader_interlock if available.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: 03a80cde2ea20ca54e8f8e5b1fabaf0200b1c757 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/03a80cde2ea20ca54e8f8e5b1faba… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Oct 13 16:23:21 2023 -0500 vkd3d: Enable VK_EXT_fragment_shader_interlock if available. --- libs/vkd3d/device.c | 29 +++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 3 ++- tests/hlsl/rasteriser-ordered-views.shader_test | 2 +- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index da9c1d96..7841a811 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -94,6 +94,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_DEBUG_MARKER, EXT_debug_marker), VK_EXTENSION(EXT_DEPTH_CLIP_ENABLE, EXT_depth_clip_enable), VK_EXTENSION(EXT_DESCRIPTOR_INDEXING, EXT_descriptor_indexing), + VK_EXTENSION(EXT_FRAGMENT_SHADER_INTERLOCK, EXT_fragment_shader_interlock), VK_EXTENSION(EXT_MUTABLE_DESCRIPTOR_TYPE, EXT_mutable_descriptor_type), VK_EXTENSION(EXT_ROBUSTNESS_2, EXT_robustness2), VK_EXTENSION(EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION, EXT_shader_demote_to_helper_invocation), @@ -789,6 +790,7 @@ struct vkd3d_physical_device_info VkPhysicalDeviceConditionalRenderingFeaturesEXT conditional_rendering_features; VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; + VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT fragment_shader_interlock_features; VkPhysicalDeviceRobustness2FeaturesEXT robustness2_features; VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT demote_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT texel_buffer_alignment_features; @@ -808,6 +810,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT *vertex_divisor_properties; VkPhysicalDeviceTexelBufferAlignmentPropertiesEXT *buffer_alignment_properties; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing_features; + VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *fragment_shader_interlock_features; VkPhysicalDeviceRobustness2FeaturesEXT *robustness2_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *vertex_divisor_features; VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; @@ -825,6 +828,7 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i conditional_rendering_features = &info->conditional_rendering_features; depth_clip_features = &info->depth_clip_features; descriptor_indexing_features = &info->descriptor_indexing_features; + fragment_shader_interlock_features = &info->fragment_shader_interlock_features; robustness2_features = &info->robustness2_features; descriptor_indexing_properties = &info->descriptor_indexing_properties; maintenance3_properties = &info->maintenance3_properties; @@ -846,6 +850,8 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i vk_prepend_struct(&info->features2, depth_clip_features); descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; vk_prepend_struct(&info->features2, descriptor_indexing_features); + fragment_shader_interlock_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_INTERLOCK_FEATURES_EXT; + vk_prepend_struct(&info->features2, fragment_shader_interlock_features); robustness2_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT; vk_prepend_struct(&info->features2, robustness2_features); demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; @@ -1158,6 +1164,7 @@ static void vkd3d_trace_physical_device_limits(const struct vkd3d_physical_devic static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_device_info *info) { + const VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *fragment_shader_interlock_features; const VkPhysicalDeviceConditionalRenderingFeaturesEXT *conditional_rendering_features; const VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT *demote_features; const VkPhysicalDeviceTexelBufferAlignmentFeaturesEXT *buffer_alignment_features; @@ -1279,6 +1286,15 @@ static void vkd3d_trace_physical_device_features(const struct vkd3d_physical_dev TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); + fragment_shader_interlock_features = &info->fragment_shader_interlock_features; + TRACE(" VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT:\n"); + TRACE(" fragmentShaderSampleInterlock: %#x.\n.", + fragment_shader_interlock_features->fragmentShaderSampleInterlock); + TRACE(" fragmentShaderPixelInterlock: %#x\n.", + fragment_shader_interlock_features->fragmentShaderPixelInterlock); + TRACE(" fragmentShaderShadingRateInterlock: %#x\n.", + fragment_shader_interlock_features->fragmentShaderShadingRateInterlock); + demote_features = &info->demote_features; TRACE(" VkPhysicalDeviceShaderDemoteToHelperInvocationFeaturesEXT:\n"); TRACE(" shaderDemoteToHelperInvocation: %#x.\n", demote_features->shaderDemoteToHelperInvocation); @@ -1476,6 +1492,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, uint32_t *device_extension_count, bool **user_extension_supported) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT *fragment_shader_interlock; const struct vkd3d_optional_device_extensions_info *optional_extensions; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; VkPhysicalDevice physical_device = device->vk_physical_device; @@ -1539,8 +1556,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.TypedUAVLoadAdditionalFormats = features->shaderStorageImageReadWithoutFormat && d3d12_device_supports_typed_uav_load_additional_formats(device); - /* GL_INTEL_fragment_shader_ordering, no Vulkan equivalent. */ - device->feature_options.ROVsSupported = FALSE; /* GL_INTEL_conservative_rasterization, no Vulkan equivalent. */ device->feature_options.ConservativeRasterizationTier = D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED; device->feature_options.MaxGPUVirtualAddressBitsPerResource = 40; /* FIXME */ @@ -1619,6 +1634,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, *user_extension_supported, vulkan_info, "device", device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + fragment_shader_interlock = &physical_device_info->fragment_shader_interlock_features; + if (!fragment_shader_interlock->fragmentShaderSampleInterlock + || !fragment_shader_interlock->fragmentShaderPixelInterlock) + vulkan_info->EXT_fragment_shader_interlock = false; + device->feature_options.ROVsSupported = vulkan_info->EXT_fragment_shader_interlock; + if (!physical_device_info->conditional_rendering_features.conditionalRendering) vulkan_info->EXT_conditional_rendering = false; if (!physical_device_info->depth_clip_features.depthClipEnable) @@ -1675,6 +1696,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING; + if (vulkan_info->EXT_fragment_shader_interlock) + vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] + = VKD3D_SHADER_SPIRV_EXTENSION_EXT_FRAGMENT_SHADER_INTERLOCK; + if (vulkan_info->EXT_shader_stencil_export) vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4f82b211..aff2c440 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -55,7 +55,7 @@ #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u -#define VKD3D_MAX_SHADER_EXTENSIONS 4u +#define VKD3D_MAX_SHADER_EXTENSIONS 5u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u #define VKD3D_MAX_DEVICE_BLOCKED_QUEUES 16u @@ -133,6 +133,7 @@ struct vkd3d_vulkan_info bool EXT_debug_marker; bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; + bool EXT_fragment_shader_interlock; bool EXT_mutable_descriptor_type; bool EXT_robustness2; bool EXT_shader_demote_to_helper_invocation; diff --git a/tests/hlsl/rasteriser-ordered-views.shader_test b/tests/hlsl/rasteriser-ordered-views.shader_test index a7aa7827..3b8f32ab 100644 --- a/tests/hlsl/rasteriser-ordered-views.shader_test +++ b/tests/hlsl/rasteriser-ordered-views.shader_test @@ -64,6 +64,6 @@ shader model >= 5.0 rov [test] -draw triangle list 93 +todo(sm>=6) draw triangle list 93 probe all rui(0x6aaaaaaa) probe uav 1 all rui(0x2aaaaaaa)

1 0

Henri Verbeet : vkd3d-shader/glsl: Use location information from the current instruction.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: 038764985ac8cb842c2be8948a15f25c3935feba URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/038764985ac8cb842c2be8948a15f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 17 18:13:02 2023 +0100 vkd3d-shader/glsl: Use location information from the current instruction. --- libs/vkd3d-shader/glsl.c | 7 +++---- libs/vkd3d-shader/vkd3d_shader_main.c | 9 ++++----- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index c234caf8..e020bf3e 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -28,7 +28,7 @@ struct vkd3d_glsl_generator }; struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) + struct vkd3d_shader_message_context *message_context) { struct vkd3d_glsl_generator *generator; @@ -38,7 +38,6 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad memset(generator, 0, sizeof(*generator)); generator->version = *version; vkd3d_string_buffer_init(&generator->buffer); - generator->location = *location; generator->message_context = message_context; return generator; } @@ -73,6 +72,8 @@ static void shader_glsl_ret(struct vkd3d_glsl_generator *generator, static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator, const struct vkd3d_shader_instruction *instruction) { + generator->location = instruction->location; + switch (instruction->handler_idx) { case VKD3DSIH_DCL_INPUT: @@ -101,10 +102,8 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - generator->location.column = 0; for (i = 0; i < program->instructions.count; ++i) { - generator->location.line = i + 1; vkd3d_glsl_handle_instruction(generator, &program->instructions.elements[i]); } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 42580f55..59a98d1b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1553,6 +1553,7 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_scan_descriptor_info1 scan_descriptor_info; + struct vsir_program *program = &parser->program; struct vkd3d_glsl_generator *glsl_generator; struct vkd3d_shader_compile_info scan_info; int ret; @@ -1562,22 +1563,20 @@ static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, switch (compile_info->target_type) { case VKD3D_SHADER_TARGET_D3D_ASM: - ret = vkd3d_dxbc_binary_to_text(&parser->program, &parser->shader_desc, - compile_info, out, VSIR_ASM_FLAG_NONE); + ret = vkd3d_dxbc_binary_to_text(program, &parser->shader_desc, compile_info, out, VSIR_ASM_FLAG_NONE); break; case VKD3D_SHADER_TARGET_GLSL: if ((ret = scan_with_parser(&scan_info, message_context, &scan_descriptor_info, parser)) < 0) return ret; - if (!(glsl_generator = vkd3d_glsl_generator_create(&parser->program.shader_version, - message_context, &parser->location))) + if (!(glsl_generator = vkd3d_glsl_generator_create(&program->shader_version, message_context))) { ERR("Failed to create GLSL generator.\n"); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); return VKD3D_ERROR; } - ret = vkd3d_glsl_generator_generate(glsl_generator, &parser->program, out); + ret = vkd3d_glsl_generator_generate(glsl_generator, program, out); vkd3d_glsl_generator_destroy(glsl_generator); vkd3d_shader_free_scan_descriptor_info1(&scan_descriptor_info); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d6f9d016..ea52f151 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1506,7 +1506,7 @@ int shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_glsl_generator; struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shader_version *version, - struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location); + struct vkd3d_shader_message_context *message_context); int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, struct vsir_program *program, struct vkd3d_shader_code *out); void vkd3d_glsl_generator_destroy(struct vkd3d_glsl_generator *generator);

1 0

Giovanni Mascellani : tests: Clear the UAV before testing.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: dff22c9ed70811e4134c50d3d6d516b465e6a068 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dff22c9ed70811e4134c50d3d6d51… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 8 23:38:21 2024 +0100 tests: Clear the UAV before testing. There is no guarantee that a resource is cleared upon creation. This fixes the test on NVIDIA and llvmpipe. --- tests/d3d12.c | 11 ----------- tests/d3d12_test_utils.h | 11 +++++++++++ tests/hlsl_d3d12.c | 7 +++++++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7655c4e9..e3771b7f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -128,17 +128,6 @@ static void check_alignment_(unsigned int line, uint64_t size, uint64_t alignmen size, aligned_size); } -static void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resource) -{ - D3D12_RESOURCE_BARRIER barrier; - - barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV; - barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; - barrier.UAV.pResource = resource; - - ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); -} - static const DXGI_FORMAT depth_stencil_formats[] = { DXGI_FORMAT_R32G8X24_TYPELESS, diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index cf27b40f..4fe6fa71 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -269,6 +269,17 @@ static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D1 ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } +static inline void uav_barrier(ID3D12GraphicsCommandList *list, ID3D12Resource *resource) +{ + D3D12_RESOURCE_BARRIER barrier; + + barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_UAV; + barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + barrier.UAV.pResource = resource; + + ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); +} + #define create_command_queue(a, b, c) create_command_queue_(__LINE__, a, b, c) static inline ID3D12CommandQueue *create_command_queue_(unsigned int line, ID3D12Device *device, D3D12_COMMAND_LIST_TYPE type, int priority) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index b2273ffb..4188d720 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -516,10 +516,17 @@ static void test_thread_id(void) for (i = 0; i < 3; ++i) { + const UINT clear_value[4] = {0}; + textures[i] = create_default_texture3d(device, 16, 8, 8, 1, DXGI_FORMAT_R32G32B32A32_UINT, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); ID3D12Device_CreateUnorderedAccessView(device, textures[i], NULL, NULL, get_cpu_descriptor_handle(&context, heap, i)); + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, heap, i), + get_cpu_descriptor_handle(&context, heap, i), + textures[i], clear_value, 0, NULL); + uav_barrier(command_list, textures[i]); } cs_code = compile_shader(cs_source, "cs_5_0");

1 0

Giovanni Mascellani : tests: Relax precision a bit for an interpolation test.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: 5e43f9980935271d75325f49f97b0f6d6f12e59d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5e43f9980935271d75325f49f97b0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 8 23:19:56 2024 +0100 tests: Relax precision a bit for an interpolation test. Otherwise the test fails on Intel, NVIDIA and llvmpipe. --- tests/hlsl/nointerpolation.shader_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/hlsl/nointerpolation.shader_test b/tests/hlsl/nointerpolation.shader_test index 94584ffe..d2b7d8a4 100644 --- a/tests/hlsl/nointerpolation.shader_test +++ b/tests/hlsl/nointerpolation.shader_test @@ -144,7 +144,7 @@ shader model >= 6.0 [test] draw triangle list 3 -probe (320,240) rgba (0.250390589, 0.499088615, 0.250520796, 1.0) 1 +probe (320,240) rgba (0.250390589, 0.499088615, 0.250520796, 1.0) 4 [require] shader model >= 4.0

1 0

Giovanni Mascellani : tests: Mark the coverage test as buggy on MoltenVK.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: 0c63824d9ff723753ec0cc774af5e1778c414c71 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c63824d9ff723753ec0cc774af5e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 8 23:14:58 2024 +0100 tests: Mark the coverage test as buggy on MoltenVK. Apparently MoltenVK doesn't set the SampleMask built-in to the fragment coverage mask. --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ce907c96..7655c4e9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33454,6 +33454,7 @@ static void test_coverage(void) reset_command_list(command_list, context.allocator); transition_resource_state(command_list, texture, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(texture, 0, queue, command_list, tests[i].sample_mask & 0xf, 0); reset_command_list(command_list, context.allocator);

1 0

Giovanni Mascellani : tests: Pop the test context when leaving its scope.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: cf816a255cb8249a20cdf0e21230977cfd867ceb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cf816a255cb8249a20cdf0e212309… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 8 17:01:53 2024 +0100 tests: Pop the test context when leaving its scope. --- tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3e75fada..ce907c96 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32383,7 +32383,10 @@ static void test_resource_allocation_info(void) ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes); if (!i) + { + vkd3d_test_pop_context(); continue; + } ok(infos1[i].Offset - infos1[i - 1].Offset >= infos1[i - 1].SizeInBytes, "Got unexpected prev size %"PRIu64", prev offset %"PRIu64", offset %"PRIu64".\n",

1 0

Giovanni Mascellani : tests: Mark the HS punned array test as buggy on MoltenVK.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: f6fe9a39dbf5accfaa4d3a3aca2b400362e0ed39 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f6fe9a39dbf5accfaa4d3a3aca2b4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Mar 8 16:53:43 2024 +0100 tests: Mark the HS punned array test as buggy on MoltenVK. MoltenVK doesn't support the Component decoration on tessellation shaders. --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 49b40a67..3e75fada 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -38139,6 +38139,7 @@ static void test_hull_shader_punned_array(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xcc996633, 0); destroy_test_context(&context);

1 0

Conor McCarthy : vkd3d-shader/dxil: Support 16-bit types.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: vkd3d Branch: master Commit: 4f0e5b9069c38bd7d3fde73e3e5131442c1d16d4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4f0e5b9069c38bd7d3fde73e3e513… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jun 13 16:51:11 2023 +1000 vkd3d-shader/dxil: Support 16-bit types. --- libs/vkd3d-shader/dxil.c | 11 +++++++++-- tests/hlsl/minimum-precision.shader_test | 16 +++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index dc810cb7..de51588b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2210,6 +2210,8 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type return VKD3D_DATA_BOOL; case 8: return VKD3D_DATA_UINT8; + case 16: + return VKD3D_DATA_UINT16; case 32: return VKD3D_DATA_UINT; case 64: @@ -2223,6 +2225,8 @@ static enum vkd3d_data_type vkd3d_data_type_from_sm6_type(const struct sm6_type { switch (type->u.width) { + case 16: + return VKD3D_DATA_HALF; case 32: return VKD3D_DATA_FLOAT; case 64: @@ -2887,7 +2891,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const } if (type->u.width == 16) - FIXME("Half float type is not supported yet.\n"); + dst->u.reg.u.immconst_u32[0] = record->operands[0]; else if (type->u.width == 32) dst->u.reg.u.immconst_f32[0] = bitcast_uint64_to_float(record->operands[0]); else if (type->u.width == 64) @@ -5130,7 +5134,10 @@ static enum vkd3d_shader_opcode sm6_map_cast_op(uint64_t code, const struct sm6_ break; case CAST_ZEXT: case CAST_SEXT: - /* nop or min precision. TODO: native 16-bit */ + /* nop or min precision. TODO: native 16-bit. + * Extension instructions could be emitted for min precision, but in Windows + * the AMD RX 580 simply drops such instructions, which makes sense as no + * assumptions should be made about any behaviour which depends on bit width. */ if (to->u.width == from->u.width || (to->u.width == 32 && from->u.width == 16)) { op = VKD3DSIH_NOP; diff --git a/tests/hlsl/minimum-precision.shader_test b/tests/hlsl/minimum-precision.shader_test index 773b2b39..f8d4eb25 100644 --- a/tests/hlsl/minimum-precision.shader_test +++ b/tests/hlsl/minimum-precision.shader_test @@ -30,16 +30,26 @@ uint4 main() : sv_target return uint4(u.x + i, u.y + j, 0, 0); } +[require] +shader model >= 4.0 +shader model < 6.0 + [test] uniform 0 uint4 0 0 0 0 draw quad probe all rgbaui (0x7fff, 0xffff, 0, 0) +[require] +shader model >= 6.0 + +[test] +uniform 0 uint4 0 0 0 0 +draw quad +probe all rgbaui (0x7fff, 0xffffffff, 0, 0) + % The code d3dcompiler_47 produces for this appears correct, but the result % is still zero in Windows. -[require] -shader model >= 6.0 [pixel shader] uniform min16uint4 u; @@ -55,7 +65,7 @@ uint4 main() : sv_target uniform 0 uint4 0 0 0 0 uniform 4 uint 2 draw quad -probe all rgbaui (0x7fff, 0xffff, 0, 0) +probe all rgbaui (0x7fff, 0xffffffff, 0, 0) uniform 0 uint4 0 0 0 0 uniform 4 uint 0 draw quad

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2024