March 2021 - Wine-commits - list.winehq.org

Mark Harmstone : ntdll: Take into account ordinal base when resolving forwarded ordinals.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 3fd9a423d426cc2ed949e075417e1d0ebe901102 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd9a423d426cc2ed949e075… Author: Mark Harmstone <mark(a)harmstone.com> Date: Wed Mar 24 01:18:59 2021 +0000 ntdll: Take into account ordinal base when resolving forwarded ordinals. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index eddceb60623..ff88c6c5b5e 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -642,9 +642,11 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) { const char *name = end + 1; - if (*name == '#') /* ordinal */ - proc = find_ordinal_export( wm->ldr.DllBase, exports, exp_size, atoi(name+1), load_path ); - else + + if (*name == '#') { /* ordinal */ + proc = find_ordinal_export( wm->ldr.DllBase, exports, exp_size, + atoi(name+1) - exports->Base, load_path ); + } else proc = find_named_export( wm->ldr.DllBase, exports, exp_size, name, -1, load_path ); }

1 0

Victor Hermann Chiletto : winevulkan: Implement vkEnumerateDeviceLayerProperties.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 2c548247c9deeac3bf943e4cf09db29752be9fd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c548247c9deeac3bf943e4c… Author: Victor Hermann Chiletto <v(a)hnn.net.br> Date: Mon Mar 22 01:17:33 2021 -0300 winevulkan: Implement vkEnumerateDeviceLayerProperties. Currently, this function is passed through winevulkan to the system's Vulkan loader, which causes the loader to write the system's device layers properties in pProperties. Unreal Engine 4 then calls vkEnumerateDeviceExtensionProperties, using VkLayerProperties::layerName as the pLayerName. winevulkan's implementation of vkEnumerateDeviceExtensionProperties then returns VK_ERROR_LAYER_NOT_PRESENT, crashing UE4. This issue was found while debugging Project Wingman (Steam appid 895870), but it should also happen to any UE4 application using the Vulkan RHI. Signed-off-by: Victor Hermann Chiletto <v(a)hnn.net.br> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 8 ++++++++ dlls/winevulkan/vulkan_thunks.c | 6 ------ dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3ad210e4701..a0e59a0370e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -153,6 +153,7 @@ FUNCTION_OVERRIDES = { "vkCreateDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : False }, "vkEnumerateDeviceExtensionProperties" : {"dispatch" : True, "driver" : False, "thunk" : False}, + "vkEnumerateDeviceLayerProperties": {"dispatch": True, "driver": False, "thunk": False}, "vkEnumeratePhysicalDeviceGroups" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceExternalBufferProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 971394eb9dd..23087c9df2e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1061,6 +1061,14 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } +VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice phys_dev, uint32_t *count, VkLayerProperties *properties) +{ + TRACE("%p, %p, %p\n", phys_dev, count, properties); + + *count = 0; + return VK_SUCCESS; +} + VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) { TRACE("%p, %p\n", count, properties); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 3974a452e6d..41104433572 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -5710,12 +5710,6 @@ VkResult WINAPI wine_vkEndCommandBuffer(VkCommandBuffer commandBuffer) return commandBuffer->device->funcs.p_vkEndCommandBuffer(commandBuffer->command_buffer); } -VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkLayerProperties *pProperties) -{ - TRACE("%p, %p, %p\n", physicalDevice, pPropertyCount, pProperties); - return physicalDevice->instance->funcs.p_vkEnumerateDeviceLayerProperties(physicalDevice->phys_dev, pPropertyCount, pProperties); -} - static VkResult WINAPI wine_vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t *pCounterCount, VkPerformanceCounterKHR *pCounters, VkPerformanceCounterDescriptionKHR *pCounterDescriptions) { TRACE("%p, %u, %p, %p, %p\n", physicalDevice, queueFamilyIndex, pCounterCount, pCounters, pCounterDescriptions); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 0b0b784f30d..6837f48224d 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -33,6 +33,7 @@ void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *p void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator); void WINAPI wine_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *pAllocator); VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties); +VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkLayerProperties *pProperties); VkResult WINAPI wine_vkEnumeratePhysicalDeviceGroups(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties); VkResult WINAPI wine_vkEnumeratePhysicalDeviceGroupsKHR(VkInstance instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices);

1 0

Alexandre Julliard : start: Avoid duplicate backslashes in command line.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 1b4b4a9bb5b6287019f09f09cf96c6b0dda666e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b4b4a9bb5b6287019f09f09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 24 11:57:44 2021 +0100 start: Avoid duplicate backslashes in command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index e3071a3a09a..4b31e07dfee 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -280,7 +280,7 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); /* 1. If extension supplied, see if that file exists */ - lstrcatW(thisDir, L"\\"); + if (thisDir[lstrlenW(thisDir) - 1] != '\\') lstrcatW(thisDir, L"\\"); lstrcatW(thisDir, stemofsearch); pos = &thisDir[lstrlenW(thisDir)]; /* Pos = end of name */

1 0

Alexandre Julliard : ntdll: Set the Wow64 environment variables from the Unix side.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 662730a1bfc0517c14d9099d2ed1433dad10be03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=662730a1bfc0517c14d9099d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 24 10:43:31 2021 +0100 ntdll: Set the Wow64 environment variables from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 100 ++++++-------------------------------------------- dlls/ntdll/unix/env.c | 59 +++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=662730a1bfc0517c14d9…

1 0

Alexandre Julliard : ntdll: Load the main image from the Unix side.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 28fe84da45bea7de56539b50eac8ebcec54342de URL: https://source.winehq.org/git/wine.git/?a=commit;h=28fe84da45bea7de56539b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 24 10:53:53 2021 +0100 ntdll: Load the main image from the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 79 +----------------------- dlls/ntdll/loader.c | 112 +++++++++++++--------------------- dlls/ntdll/unix/env.c | 70 +++++++++++++++++++-- dlls/ntdll/unix/file.c | 135 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 112 +++++++++++++++++++++++++++++++--- dlls/ntdll/unix/unix_private.h | 3 + 6 files changed, 349 insertions(+), 162 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28fe84da45bea7de5653…

1 0

Zebediah Figura : vkd3d-shader: Forbid storage modifiers on struct fields.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: vkd3d Branch: master Commit: e285fc57d2a86d982dc375f47699d08f303b04ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e285fc57d2a86d982dc375f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:35 2021 -0500 vkd3d-shader: Forbid storage modifiers on struct fields. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 15 +++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 85859ad..4526348 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -340,7 +340,6 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u field->name = vkd3d_strdup(old_field->name); if (old_field->semantic) field->semantic = vkd3d_strdup(old_field->semantic); - field->modifiers = old_field->modifiers; field->reg_offset = reg_size; reg_size += field->type->reg_size; list_add_tail(type->e.elements, &field->entry); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 819b882..523d156 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -134,7 +134,6 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - DWORD modifiers; unsigned int reg_offset; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45767de..4b0ddea 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -721,8 +721,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } -static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, - DWORD modifiers, struct list *fields) +static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; struct hlsl_struct_field *field; @@ -748,7 +747,6 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); field->loc = v->loc; field->name = v->name; - field->modifiers = modifiers; field->semantic = v->semantic; if (v->initializer.args_count) { @@ -1937,7 +1935,16 @@ field: if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$ = gen_struct_fields(ctx, type, modifiers, $3); + if (modifiers) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, modifiers))) + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on struct fields.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } + $$ = gen_struct_fields(ctx, type, $3); } func_declaration:

1 0

Zebediah Figura : vkd3d-shader: Inline declare_variable() into its caller.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: vkd3d Branch: master Commit: 7d8491516a3dc59f2380dbdebb799ec76dc73bbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7d8491516a3dc59f2380dbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:36 2021 -0500 vkd3d-shader: Inline declare_variable() into its caller. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 94 +++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4b0ddea..41fea19 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -292,60 +292,6 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct return &cast->node; } -static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, bool local) -{ - struct hlsl_ir_function_decl *func; - bool ret; - - if (decl->data_type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, decl->modifiers, decl->loc); - - if (local) - { - DWORD invalid = decl->modifiers & (HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED - | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM); - - if (invalid) - { - struct vkd3d_string_buffer *string; - - if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, invalid))) - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on local variables.", string->buffer); - vkd3d_string_buffer_release(&ctx->string_buffers, string); - } - - if (decl->semantic) - { - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, - "Semantics are not allowed on local variables."); - return false; - } - } - else - { - if ((func = hlsl_get_func_decl(ctx, decl->name))) - { - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, - "Variable '%s' is already defined as a function.", decl->name); - hlsl_note(ctx, func->loc, VKD3D_SHADER_LOG_ERROR, - "\"%s\" was previously defined here.", decl->name); - return false; - } - } - ret = hlsl_add_var(ctx, decl, local); - if (!ret) - { - struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, decl->name); - - hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, - "Variable \"%s\" was already declared in this scope.", decl->name); - hlsl_note(ctx, old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); - return false; - } - return true; -} - static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, const struct vkd3d_shader_location loc) { if (modifiers & mod) @@ -1431,10 +1377,11 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t DWORD modifiers, struct list *var_list) { struct parse_variable_def *v, *v_next; + struct hlsl_ir_function_decl *func; struct list *statements_list; struct hlsl_ir_var *var; struct hlsl_type *type; - bool ret, local = true; + bool local = true; if (basic_type->type == HLSL_CLASS_MATRIX) assert(basic_type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); @@ -1464,10 +1411,39 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } + if (var->data_type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(ctx, var->modifiers, var->loc); + if (ctx->cur_scope == ctx->globals) { var->modifiers |= HLSL_STORAGE_UNIFORM; local = false; + + if ((func = hlsl_get_func_decl(ctx, var->name))) + { + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "'%s' is already defined as a function.", var->name); + hlsl_note(ctx, func->loc, VKD3D_SHADER_LOG_ERROR, + "'%s' was previously defined here.", var->name); + } + } + else + { + static const unsigned int invalid = HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED + | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM; + + if (var->modifiers & invalid) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, var->modifiers & invalid))) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on local variables.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } + if (var->semantic) + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, + "Semantics are not allowed on local variables."); } if ((type->modifiers & HLSL_MODIFIER_CONST) && !v->initializer.args_count @@ -1480,9 +1456,13 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - ret = declare_variable(ctx, var, local); - if (!ret) + if (!hlsl_add_var(ctx, var, local)) { + struct hlsl_ir_var *old = hlsl_get_var(ctx->cur_scope, var->name); + + hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, + "Variable \"%s\" was already declared in this scope.", var->name); + hlsl_note(ctx, old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); vkd3d_free(v); continue;

1 0

Zebediah Figura : vkd3d-shader: Use separate flag fields to track whether a variable is a uniform or varying.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: vkd3d Branch: master Commit: c16a07caff5dd7307e7464f758c02ec43187fe58 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c16a07caff5dd7307e7464f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:37 2021 -0500 vkd3d-shader: Use separate flag fields to track whether a variable is a uniform or varying. Mostly in order to make it clearer that these don't directly correspond to the modifiers with which the variable was declared. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 22 ++++++++-------------- libs/vkd3d-shader/hlsl.h | 8 +++++--- libs/vkd3d-shader/hlsl.y | 32 +++++++++++++++++++++++--------- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 4526348..794166d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -388,7 +388,7 @@ struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ir_node *node) } struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, - const char *semantic, unsigned int modifiers, const struct hlsl_reg_reservation *reg_reservation) + const char *semantic, const struct hlsl_reg_reservation *reg_reservation) { struct hlsl_ir_var *var; @@ -399,7 +399,6 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const var->data_type = type; var->loc = loc; var->semantic = semantic; - var->modifiers = modifiers; var->reg_reservation = reg_reservation; return var; } @@ -407,7 +406,7 @@ struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc) { - struct hlsl_ir_var *var = hlsl_new_var(vkd3d_strdup(name), type, loc, NULL, 0, NULL); + struct hlsl_ir_var *var = hlsl_new_var(vkd3d_strdup(name), type, loc, NULL, NULL); if (var) list_add_tail(&ctx->globals->vars, &var->scope_entry); @@ -869,17 +868,12 @@ static void dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src * static void dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) { - if (var->modifiers) - { - struct vkd3d_string_buffer_cache string_buffers; - struct vkd3d_string_buffer *string; - - vkd3d_string_buffer_cache_init(&string_buffers); - if ((string = hlsl_modifiers_to_string(&string_buffers, var->modifiers))) - vkd3d_string_buffer_printf(buffer, "%s ", string->buffer); - vkd3d_string_buffer_release(&string_buffers, string); - vkd3d_string_buffer_cache_cleanup(&string_buffers); - } + if (var->is_input_varying) + vkd3d_string_buffer_printf(buffer, "in "); + if (var->is_output_varying) + vkd3d_string_buffer_printf(buffer, "out "); + if (var->is_uniform) + vkd3d_string_buffer_printf(buffer, "uniform "); vkd3d_string_buffer_printf(buffer, "%s %s", debug_hlsl_type(var->data_type), var->name); if (var->semantic) vkd3d_string_buffer_printf(buffer, " : %s", var->semantic); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 523d156..cc740ea 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -204,11 +204,14 @@ struct hlsl_ir_var struct vkd3d_shader_location loc; const char *name; const char *semantic; - unsigned int modifiers; const struct hlsl_reg_reservation *reg_reservation; struct list scope_entry, param_entry; unsigned int first_write, last_read; + + uint32_t is_input_varying : 1; + uint32_t is_output_varying : 1; + uint32_t is_uniform : 1; }; struct hlsl_ir_function @@ -546,8 +549,7 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i struct hlsl_ir_node *hlsl_new_unary_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_var *hlsl_new_var(const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc, - const char *semantic, unsigned int modifiers, - const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; + const char *semantic, const struct hlsl_reg_reservation *reg_reservation) DECLSPEC_HIDDEN; struct hlsl_ir_load *hlsl_new_var_load(struct hlsl_ir_var *var, const struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; void hlsl_error(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, enum vkd3d_shader_error error, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 41fea19..912064b 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -763,9 +763,21 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, if (param->type->type == HLSL_CLASS_MATRIX) assert(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); - if (!(var = hlsl_new_var(param->name, param->type, loc, param->semantic, param->modifiers, param->reg_reservation))) + if (!(var = hlsl_new_var(param->name, param->type, loc, param->semantic, param->reg_reservation))) return false; + if (param->modifiers & HLSL_STORAGE_UNIFORM) + { + var->is_uniform = 1; + } + else + { + if (param->modifiers & HLSL_STORAGE_IN) + var->is_input_varying = 1; + if (param->modifiers & HLSL_STORAGE_OUT) + var->is_output_varying = 1; + } + if (!hlsl_add_var(ctx, var, false)) { hlsl_free_var(var); @@ -1405,18 +1417,20 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); - if (!(var = hlsl_new_var(v->name, type, v->loc, v->semantic, modifiers, v->reg_reservation))) + if (type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(ctx, modifiers, v->loc); + + if (!(var = hlsl_new_var(v->name, type, v->loc, v->semantic, v->reg_reservation))) { free_parse_variable_def(v); continue; } - if (var->data_type->type != HLSL_CLASS_MATRIX) - check_invalid_matrix_modifiers(ctx, var->modifiers, var->loc); - if (ctx->cur_scope == ctx->globals) { - var->modifiers |= HLSL_STORAGE_UNIFORM; + if (!(modifiers & HLSL_STORAGE_STATIC)) + var->is_uniform = 1; + local = false; if ((func = hlsl_get_func_decl(ctx, var->name))) @@ -1432,11 +1446,11 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t static const unsigned int invalid = HLSL_STORAGE_EXTERN | HLSL_STORAGE_SHARED | HLSL_STORAGE_GROUPSHARED | HLSL_STORAGE_UNIFORM; - if (var->modifiers & invalid) + if (modifiers & invalid) { struct vkd3d_string_buffer *string; - if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, var->modifiers & invalid))) + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, modifiers & invalid))) hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, "Modifiers '%s' are not allowed on local variables.", string->buffer); vkd3d_string_buffer_release(&ctx->string_buffers, string); @@ -1447,7 +1461,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t } if ((type->modifiers & HLSL_MODIFIER_CONST) && !v->initializer.args_count - && !(var->modifiers & (HLSL_STORAGE_STATIC | HLSL_STORAGE_UNIFORM))) + && !(modifiers & (HLSL_STORAGE_STATIC | HLSL_STORAGE_UNIFORM))) { hlsl_error(ctx, v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b9f753a..f27714c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -403,9 +403,9 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->modifiers & HLSL_STORAGE_IN) + if (var->is_input_varying) var->first_write = 1; - if (var->modifiers & HLSL_STORAGE_OUT) + if (var->is_output_varying) var->last_read = UINT_MAX; }

1 0

Zebediah Figura : vkd3d-shader: Do not mark objects as uniform or varying.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: vkd3d Branch: master Commit: 154a73a5b17245ceec449964c664e63356a7b316 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=154a73a5b17245ceec44996… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:38 2021 -0500 vkd3d-shader: Do not mark objects as uniform or varying. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 912064b..ab7059d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -766,16 +766,19 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct list *list, if (!(var = hlsl_new_var(param->name, param->type, loc, param->semantic, param->reg_reservation))) return false; - if (param->modifiers & HLSL_STORAGE_UNIFORM) + if (param->type->type != HLSL_CLASS_OBJECT) { - var->is_uniform = 1; - } - else - { - if (param->modifiers & HLSL_STORAGE_IN) - var->is_input_varying = 1; - if (param->modifiers & HLSL_STORAGE_OUT) - var->is_output_varying = 1; + if (param->modifiers & HLSL_STORAGE_UNIFORM) + { + var->is_uniform = 1; + } + else + { + if (param->modifiers & HLSL_STORAGE_IN) + var->is_input_varying = 1; + if (param->modifiers & HLSL_STORAGE_OUT) + var->is_output_varying = 1; + } } if (!hlsl_add_var(ctx, var, false)) @@ -1428,7 +1431,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (ctx->cur_scope == ctx->globals) { - if (!(modifiers & HLSL_STORAGE_STATIC)) + if (type->type != HLSL_CLASS_OBJECT && !(modifiers & HLSL_STORAGE_STATIC)) var->is_uniform = 1; local = false;

1 0

Zebediah Figura : vkd3d-shader: Treat entry point parameters as written to if they are uniform.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: vkd3d Branch: master Commit: 2d109b69f949ba5bc3ae70c5080b12dbd036e2da URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d109b69f949ba5bc3ae70c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 22 17:02:39 2021 -0500 vkd3d-shader: Treat entry point parameters as written to if they are uniform. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index f27714c..595e7da 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -403,7 +403,7 @@ static void compute_liveness(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl LIST_FOR_EACH_ENTRY(var, entry_func->parameters, struct hlsl_ir_var, param_entry) { - if (var->is_input_varying) + if (var->is_input_varying || var->is_uniform) var->first_write = 1; if (var->is_output_varying) var->last_read = UINT_MAX;

1 0