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

Stefan Dösinger : vkd3d: Add a win32 version of vkd3d_get_program_name.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: d6b1e62ffca368d65e2b03657cc66b391728d767 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6b1e62ffca368d65e2b03657cc66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 27 12:21:44 2023 +0300 vkd3d: Add a win32 version of vkd3d_get_program_name. --- libs/vkd3d/utils.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 58747342..11029c9f 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -901,6 +901,30 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX]) return true; } +#elif defined(WIN32) + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + char buffer[MAX_PATH]; + char *p, *name; + size_t len; + + *program_name = '\0'; + len = GetModuleFileNameA(NULL, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return false; + + name = buffer; + if ((p = strrchr(name, '/'))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + memcpy(program_name, name, len); + return true; +} + #else bool vkd3d_get_program_name(char program_name[PATH_MAX])

1 0

Giovanni Mascellani : vkd3d: Warn about missing extensions only when meaningful.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 29c63906bc59f5adb935974fb76e1751f9e588a6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/29c63906bc59f5adb935974fb76e1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 11:27:27 2024 +0200 vkd3d: Warn about missing extensions only when meaningful. --- libs/vkd3d/device.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3f3332dd..5ba201ac 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -272,13 +272,15 @@ static bool has_extension(const VkExtensionProperties *extensions, for (i = 0; i < count; ++i) { - if (is_extension_disabled(extension_name)) - { - WARN("Extension %s is disabled.\n", debugstr_a(extension_name)); - continue; - } if (!strcmp(extensions[i].extensionName, extension_name)) + { + if (is_extension_disabled(extension_name)) + { + WARN("Extension %s is disabled.\n", debugstr_a(extension_name)); + return false; + } return true; + } } return false; }

1 0

Giovanni Mascellani : vkd3d: Move checking device extensions to a dedicated function.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: dbe3384609af274ba681c75b948ddc7377fedede URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dbe3384609af274ba681c75b948dd… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 15:05:24 2024 +0200 vkd3d: Move checking device extensions to a dedicated function. --- libs/vkd3d/device.c | 110 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 47 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5ba201ac..da0ffa06 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1517,6 +1517,63 @@ static bool d3d12_device_supports_typed_uav_load_additional_formats(const struct return true; } +static HRESULT vkd3d_check_device_extensions(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info, VkExtensionProperties **vk_extensions, + uint32_t *vk_extension_count, uint32_t *device_extension_count, bool **user_extension_supported) +{ + const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; + const struct vkd3d_optional_device_extensions_info *optional_extensions; + VkPhysicalDevice physical_device = device->vk_physical_device; + struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; + VkResult vr; + + *device_extension_count = 0; + + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, vk_extension_count, NULL))) < 0) + { + ERR("Failed to enumerate device extensions, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (!*vk_extension_count) + return S_OK; + + if (!(*vk_extensions = vkd3d_calloc(*vk_extension_count, sizeof(**vk_extensions)))) + return E_OUTOFMEMORY; + + TRACE("Enumerating %u device extensions.\n", *vk_extension_count); + if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, vk_extension_count, *vk_extensions))) < 0) + { + ERR("Failed to enumerate device extensions, vr %d.\n", vr); + vkd3d_free(*vk_extensions); + return hresult_from_vk_result(vr); + } + + optional_extensions = vkd3d_find_struct(create_info->next, OPTIONAL_DEVICE_EXTENSIONS_INFO); + if (optional_extensions && optional_extensions->extension_count) + { + if (!(*user_extension_supported = vkd3d_calloc(optional_extensions->extension_count, sizeof(bool)))) + { + vkd3d_free(*vk_extensions); + return E_OUTOFMEMORY; + } + } + else + { + *user_extension_supported = NULL; + } + + *device_extension_count = vkd3d_check_extensions(*vk_extensions, *vk_extension_count, + required_device_extensions, ARRAY_SIZE(required_device_extensions), + optional_device_extensions, ARRAY_SIZE(optional_device_extensions), + create_info->device_extensions, create_info->device_extension_count, + optional_extensions ? optional_extensions->extensions : NULL, + optional_extensions ? optional_extensions->extension_count : 0, + *user_extension_supported, vulkan_info, "device", + device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + + return S_OK; +} + static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info, struct vkd3d_physical_device_info *physical_device_info, @@ -1525,14 +1582,13 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, const VkPhysicalDeviceSubgroupProperties *subgroup_properties = &physical_device_info->subgroup_properties; 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; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; VkExtensionProperties *vk_extensions; VkPhysicalDeviceFeatures *features; - uint32_t count; - VkResult vr; + uint32_t vk_extension_count; + HRESULT hr; /* SHUFFLE is required to implement WaveReadLaneAt with dynamically uniform index before SPIR-V 1.5 / Vulkan 1.2. */ static const VkSubgroupFeatureFlags required_subgroup_features = VK_SUBGROUP_FEATURE_ARITHMETIC_BIT @@ -1544,8 +1600,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static const VkSubgroupFeatureFlags required_stages = VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; - *device_extension_count = 0; - vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); vkd3d_trace_physical_device_features(physical_device_info); vkd3d_trace_physical_device_limits(physical_device_info); @@ -1636,47 +1690,9 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) - { - ERR("Failed to enumerate device extensions, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if (!count) - return S_OK; - - if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) - return E_OUTOFMEMORY; - - TRACE("Enumerating %u device extensions.\n", count); - if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, vk_extensions))) < 0) - { - ERR("Failed to enumerate device extensions, vr %d.\n", vr); - vkd3d_free(vk_extensions); - return hresult_from_vk_result(vr); - } - - optional_extensions = vkd3d_find_struct(create_info->next, OPTIONAL_DEVICE_EXTENSIONS_INFO); - if (optional_extensions && optional_extensions->extension_count) - { - if (!(*user_extension_supported = vkd3d_calloc(optional_extensions->extension_count, sizeof(bool)))) - { - vkd3d_free(vk_extensions); - return E_OUTOFMEMORY; - } - } - else - { - *user_extension_supported = NULL; - } - - *device_extension_count = vkd3d_check_extensions(vk_extensions, count, - required_device_extensions, ARRAY_SIZE(required_device_extensions), - optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - create_info->device_extensions, create_info->device_extension_count, - optional_extensions ? optional_extensions->extensions : NULL, - optional_extensions ? optional_extensions->extension_count : 0, - *user_extension_supported, vulkan_info, "device", - device->vkd3d_instance->config_flags & VKD3D_CONFIG_FLAG_VULKAN_DEBUG); + if (FAILED(hr = vkd3d_check_device_extensions(device, create_info, &vk_extensions, &vk_extension_count, + device_extension_count, user_extension_supported))) + return hr; fragment_shader_interlock = &physical_device_info->fragment_shader_interlock_features; if (!fragment_shader_interlock->fragmentShaderSampleInterlock @@ -1703,7 +1719,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->texel_buffer_alignment_properties = physical_device_info->texel_buffer_alignment_properties; - if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) + if (get_spec_version(vk_extensions, vk_extension_count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3) { const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; divisor_features = &physical_device_info->vertex_divisor_features;

1 0

Giovanni Mascellani : vkd3d: Do not automatically succeed if no extensions are available.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 826b75722bd0d3927f2474bbc70fcaf3f6b6453d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/826b75722bd0d3927f2474bbc70fc… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 15:07:40 2024 +0200 vkd3d: Do not automatically succeed if no extensions are available. So error messages for missing required extensions are emitted. --- libs/vkd3d/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index da0ffa06..865eba76 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -424,8 +424,6 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, ERR("Failed to enumerate instance extensions, vr %d.\n", vr); return hresult_from_vk_result(vr); } - if (!count) - return S_OK; if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) return E_OUTOFMEMORY; @@ -1534,8 +1532,6 @@ static HRESULT vkd3d_check_device_extensions(struct d3d12_device *device, ERR("Failed to enumerate device extensions, vr %d.\n", vr); return hresult_from_vk_result(vr); } - if (!*vk_extension_count) - return S_OK; if (!(*vk_extensions = vkd3d_calloc(*vk_extension_count, sizeof(**vk_extensions)))) return E_OUTOFMEMORY;

1 0

Giovanni Mascellani : vkd3d: Init physical device information after checking available extensions.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: ea090a34cd2ed16ce345098209977b33304bc27b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea090a34cd2ed16ce345098209977… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun May 5 15:10:56 2024 +0200 vkd3d: Init physical device information after checking available extensions. --- libs/vkd3d/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 865eba76..9fe4f08d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1596,6 +1596,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, static const VkSubgroupFeatureFlags required_stages = VK_SHADER_STAGE_COMPUTE_BIT | VK_SHADER_STAGE_FRAGMENT_BIT; + if (FAILED(hr = vkd3d_check_device_extensions(device, create_info, &vk_extensions, &vk_extension_count, + device_extension_count, user_extension_supported))) + return hr; + + vkd3d_physical_device_info_init(physical_device_info, device); + vkd3d_trace_physical_device(physical_device, physical_device_info, vk_procs); vkd3d_trace_physical_device_features(physical_device_info); vkd3d_trace_physical_device_limits(physical_device_info); @@ -1686,10 +1692,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0; device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED; - if (FAILED(hr = vkd3d_check_device_extensions(device, create_info, &vk_extensions, &vk_extension_count, - device_extension_count, user_extension_supported))) - return hr; - fragment_shader_interlock = &physical_device_info->fragment_shader_interlock_features; if (!fragment_shader_interlock->fragmentShaderSampleInterlock || !fragment_shader_interlock->fragmentShaderPixelInterlock) @@ -2112,8 +2114,6 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); - vkd3d_physical_device_info_init(&physical_device_info, device); - if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &physical_device_info, &extension_count, &user_extension_supported))) return hr;

1 0

Nikolay Sivov : vkd3d-shader/fx: Filter out unsupported object types.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 1a79d1e945a691fcd8be922445fe207d3156d424 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1a79d1e945a691fcd8be922445fe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 04:05:00 2024 +0200 vkd3d-shader/fx: Filter out unsupported object types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9c2bd72a..c55577ad 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1122,7 +1122,7 @@ static void write_buffers(struct fx_write_context *fx) } } -static bool is_object_variable(const struct hlsl_ir_var *var) +static bool is_supported_object_variable(const struct hlsl_ctx *ctx, const struct hlsl_ir_var *var) { const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type); @@ -1133,7 +1133,13 @@ static bool is_object_variable(const struct hlsl_ir_var *var) case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_SAMPLER: case HLSL_CLASS_TEXTURE: + return true; case HLSL_CLASS_UAV: + if (ctx->profile->major_version < 5) + return false; + if (type->e.resource.rasteriser_ordered) + return false; + return true; case HLSL_CLASS_VERTEX_SHADER: return true; @@ -1144,14 +1150,15 @@ static bool is_object_variable(const struct hlsl_ir_var *var) static void write_objects(struct fx_write_context *fx, bool shared) { + struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ir_var *var; if (shared && !fx->child_effect) return; - LIST_FOR_EACH_ENTRY(var, &fx->ctx->extern_vars, struct hlsl_ir_var, extern_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (!is_object_variable(var)) + if (!is_supported_object_variable(ctx, var)) continue; if (fx->child_effect && (shared != !!(var->storage_modifiers & HLSL_STORAGE_SHARED)))

1 0

Nikolay Sivov : vkd3d-shader/fx: Set UAV count in the header.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 3c6470e3b2590fe44bee4fa87b95ce9d4cee21b4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3c6470e3b2590fe44bee4fa87b95c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:40:14 2024 +0200 vkd3d-shader/fx: Set UAV count in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index c55577ad..1100dd2e 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -90,6 +90,7 @@ struct fx_write_context uint32_t dsv_count; uint32_t rtv_count; uint32_t texture_count; + uint32_t uav_count; int status; bool child_effect; @@ -1029,6 +1030,7 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ fx->texture_count += elements_count; break; case HLSL_CLASS_UAV: + fx->uav_count += elements_count; break; case HLSL_CLASS_PIXEL_SHADER: @@ -1263,7 +1265,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.shader_count); put_u32(&buffer, 0); /* Inline shader count. */ put_u32(&buffer, fx.group_count); /* Group count. */ - put_u32(&buffer, 0); /* UAV count. */ + put_u32(&buffer, fx.uav_count); put_u32(&buffer, 0); /* Interface variables count. */ put_u32(&buffer, 0); /* Interface variable element count. */ put_u32(&buffer, 0); /* Class instance elements count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Initial support for writing sample state objects.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 0053cc52b7e0f16e42df3cd258d2cec3227b02f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0053cc52b7e0f16e42df3cd258d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 21 00:33:41 2024 +0200 vkd3d-shader/fx: Initial support for writing sample state objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 347 +++++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 2 + 2 files changed, 338 insertions(+), 11 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Turn hlsl_state_block_entry arguments into hlsl_src.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: 68483d070f6f02c6d7c5d280dda719ab34dfd16e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68483d070f6f02c6d7c5d280dda71… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 19 15:15:19 2024 -0400 vkd3d-shader/hlsl: Turn hlsl_state_block_entry arguments into hlsl_src. This allows to apply passes that replace instructions in hlsl_state_block_entry.instrs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index bb25e0ea..96e73d23 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -136,7 +136,11 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) static void free_state_block_entry(struct hlsl_state_block_entry *entry) { + unsigned int i; + vkd3d_free(entry->name); + for (i = 0; i < entry->args_count; ++i) + hlsl_src_remove(&entry->args[i]); vkd3d_free(entry->args); hlsl_block_cleanup(entry->instrs); vkd3d_free(entry->instrs); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4a8e3524..556d6b5f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -483,7 +483,7 @@ struct hlsl_state_block_entry struct hlsl_block *instrs; /* For assignments, arguments of the rhs initializer. */ - struct hlsl_ir_node **args; + struct hlsl_src *args; unsigned int args_count; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 266ed50c..79317bb0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6912,6 +6912,7 @@ state_block: | state_block stateblock_lhs_identifier state_block_index_opt '=' complex_initializer ';' { struct hlsl_state_block_entry *entry; + unsigned int i; if (!(entry = hlsl_alloc(ctx, sizeof(*entry)))) YYABORT; @@ -6921,8 +6922,13 @@ state_block: entry->lhs_index = $3.index; entry->instrs = $5.instrs; - entry->args = $5.args; + entry->args_count = $5.args_count; + if (!(entry->args = hlsl_alloc(ctx, sizeof(*entry->args) * entry->args_count))) + YYABORT; + for (i = 0; i < entry->args_count; ++i) + hlsl_src_from_node(&entry->args[i], $5.args[i]); + vkd3d_free($5.args); $$ = $1; state_block_add_entry($$, entry);

1 0

Zebediah Figura : vkd3d-shader/fx: Skip uniform copy logic for global variables.
by Alexandre Julliard 08 May '24

08 May '24

Module: vkd3d Branch: master Commit: c2eb563e503c787ab63b79971e4c462a2225e08d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2eb563e503c787ab63b79971e4c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 21:38:06 2024 +0200 vkd3d-shader/fx: Skip uniform copy logic for global variables. --- libs/vkd3d-shader/fx.c | 14 ++++++++++---- libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl_codegen.c | 17 +++++------------ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index fae9d791..07c78528 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -169,7 +169,7 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co struct fx_write_context *fx) { unsigned int version = ctx->profile->major_version; - struct hlsl_block block; + struct hlsl_ir_var *var; memset(fx, 0, sizeof(*fx)); @@ -197,9 +197,15 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect; fx->include_empty_buffers = version == 4 && ctx->include_empty_buffers; - hlsl_block_init(&block); - hlsl_prepend_global_uniform_copy(fx->ctx, &block); - hlsl_block_cleanup(&block); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) + { + list_add_tail(&ctx->extern_vars, &var->extern_entry); + var->is_uniform = 1; + } + } + hlsl_calculate_buffer_offsets(fx->ctx); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 556d6b5f..4e33c1bd 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1400,7 +1400,6 @@ unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); void hlsl_calculate_buffer_offsets(struct hlsl_ctx *ctx); -void hlsl_prepend_global_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *block); const struct hlsl_type *hlsl_get_multiarray_element_type(const struct hlsl_type *type); unsigned int hlsl_get_multiarray_size(const struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e0254ef4..8882deaf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5314,17 +5314,6 @@ static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *bod } } -void hlsl_prepend_global_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *body) -{ - struct hlsl_ir_var *var; - - LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) - { - if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) - prepend_uniform_copy(ctx, body, var); - } -} - int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { @@ -5353,7 +5342,11 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_matrix_swizzles, body); lower_ir(ctx, lower_index_loads, body); - hlsl_prepend_global_uniform_copy(ctx, body); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) + prepend_uniform_copy(ctx, body, var); + } for (i = 0; i < entry_func->parameters.count; ++i) {

1 0