July 2024 - Wine-Commits - list.winehq.org

Giovanni Mascellani : vkd3d: Do not synchronize with the tessellation shader stages if they're not enabled.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 7958babb39ccd53efc7c67edc0e9a3d1c860f8f4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7958babb39ccd53efc7c67edc0e9a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Jun 1 21:50:31 2024 +0200 vkd3d: Do not synchronize with the tessellation shader stages if they're not enabled. Similarly to a54187f3c9c9ad4a5d1357721104f28c498ac112, this fixes some validation errors on devices that do not support tessellation; the Adreno 540 on my OnePlus 5 phone in my specific case. --- libs/vkd3d/command.c | 5 +++-- libs/vkd3d/device.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6c463be8..2354938c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2034,11 +2034,12 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, if (vk_queue_flags & VK_QUEUE_GRAPHICS_BIT) { queue_shader_stages |= VK_PIPELINE_STAGE_VERTEX_SHADER_BIT - | VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT - | VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT; if (device->vk_info.geometry_shaders) queue_shader_stages |= VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT; + if (device->vk_info.tessellation_shaders) + queue_shader_stages |= VK_PIPELINE_STAGE_TESSELLATION_CONTROL_SHADER_BIT + | VK_PIPELINE_STAGE_TESSELLATION_EVALUATION_SHADER_BIT; } if (vk_queue_flags & VK_QUEUE_COMPUTE_BIT) queue_shader_stages |= VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 674e46fe..2bbc1705 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1644,6 +1644,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->device_limits = physical_device_info->properties2.properties.limits; vulkan_info->sparse_properties = physical_device_info->properties2.properties.sparseProperties; vulkan_info->geometry_shaders = physical_device_info->features2.features.geometryShader; + vulkan_info->tessellation_shaders = physical_device_info->features2.features.tessellationShader; vulkan_info->sparse_binding = features->sparseBinding; vulkan_info->sparse_residency_3d = features->sparseResidencyImage3D; vulkan_info->rasterization_stream = physical_device_info->xfb_properties.transformFeedbackRasterizationStreamSelect; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 226b71fe..733163e3 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,6 +147,7 @@ struct vkd3d_vulkan_info bool rasterization_stream; bool transform_feedback_queries; bool geometry_shaders; + bool tessellation_shaders; bool uav_read_without_format;

1 0

Giovanni Mascellani : tests: Check that depth/stencil formats are supported before using them.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 3ff813056607dea82859a48e49962858733fecc4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3ff813056607dea82859a48e49962… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Jun 1 21:39:04 2024 +0200 tests: Check that depth/stencil formats are supported before using them. This fixes a crash with the Qualcomm proprietary driver on an Adreno 540 GPU on my OnePlus 5 phone. --- tests/d3d12.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c18dbb80..31f387db 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -547,6 +547,19 @@ static bool is_typed_uav_format_supported(ID3D12Device *device, DXGI_FORMAT form return format_support.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; } +static bool is_ds_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)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + return format_support.Support1 & D3D12_FORMAT_SUPPORT1_DEPTH_STENCIL; +} + static bool are_unaligned_block_textures_supported(ID3D12Device *device) { D3D12_FEATURE_DATA_D3D12_OPTIONS8 options; @@ -21021,11 +21034,12 @@ static void test_depth_stencil_sampling(void) DXGI_FORMAT depth_view_format; DXGI_FORMAT stencil_view_format; bool is_mvk_bug; + bool is_qualcomm_todo; } tests[] = { {DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_D32_FLOAT_S8X24_UINT, - DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, DXGI_FORMAT_X32_TYPELESS_G8X24_UINT}, + DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, DXGI_FORMAT_X32_TYPELESS_G8X24_UINT, false, true}, {DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, DXGI_FORMAT_R32_FLOAT}, {DXGI_FORMAT_R24G8_TYPELESS, DXGI_FORMAT_D24_UNORM_S8_UINT, @@ -21117,8 +21131,19 @@ static void test_depth_stencil_sampling(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + bool supported = is_ds_format_supported(device, tests[i].dsv_format); + vkd3d_test_push_context("Test %u", i); + todo_if(tests[i].is_qualcomm_todo && is_qualcomm_device(device)) + ok(supported, "Depth/stencil format %#x is not supported.\n", tests[i].dsv_format); + + if (!supported) + { + vkd3d_test_pop_context(); + continue; + } + reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width,

1 0

Giovanni Mascellani : tests: Skip sampling cube textures on Qualcomm.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: fe787cf77f8732aad136fc67802d9d113ca69876 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe787cf77f8732aad136fc67802d9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Jun 1 21:38:52 2024 +0200 tests: Skip sampling cube textures on Qualcomm. They seem to always crash on the Adreno 540 on my OnePlus 5 phone with the Qualcomm proprietary driver. --- tests/d3d12.c | 6 ++++++ tests/d3d12_crosstest.h | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index fcdf844d..79444f1d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15616,6 +15616,12 @@ static void test_sample_c_lz(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + if (is_qualcomm_device(device)) + { + skip("Sampling a cube texture crashes on Qualcomm.\n"); + break; + } + vkd3d_test_push_context("test %u", i); ps_constant.x = tests[i].d_ref; diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 99641425..c24623ca 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -417,6 +417,11 @@ static inline bool is_nvidia_device(ID3D12Device *device) return false; } +static inline bool is_qualcomm_device(ID3D12Device *device) +{ + return false; +} + static inline bool is_radv_device(ID3D12Device *device) { return false; @@ -709,6 +714,14 @@ static inline bool is_nvidia_device(ID3D12Device *device) return properties.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; } +static inline bool is_qualcomm_device(ID3D12Device *device) +{ + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, NULL, &properties); + return properties.driverID == VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR; +} + static inline bool is_radv_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties;

1 0

Giovanni Mascellani : tests: Transition resources to PIXEL_SHADER_RESOURCE in test_sample_c_lz().
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 9f056f398963c24530034235317a51fbdf242822 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9f056f398963c24530034235317a5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Jun 1 21:38:59 2024 +0200 tests: Transition resources to PIXEL_SHADER_RESOURCE in test_sample_c_lz(). --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 79444f1d..c18dbb80 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15506,6 +15506,8 @@ static void test_sample_c_lz(void) transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + transition_resource_state(command_list, ds_offset.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); memset(&ps_constant, 0, sizeof(ps_constant)); for (j = 0; j < ARRAY_SIZE(shaders_2d_array); ++j)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Do not crash on initialization of a redefined variable.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 4d2ce385a7b9d738407c3c59787505c23b2bb0fa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4d2ce385a7b9d738407c3c5978750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 22:19:40 2024 +0200 vkd3d-shader/hlsl: Do not crash on initialization of a redefined variable. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 9 ++++++++- tests/hlsl/default-values.shader_test | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f5611e67..c7af2a10 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2629,7 +2629,14 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var if (is_default_values_initializer) { - assert(!var->default_values); + /* Default values might have been allocated already for another variable of the same name, + in the same scope. */ + if (var->default_values) + { + free_parse_variable_def(v); + continue; + } + if (!(var->default_values = hlsl_calloc(ctx, component_count, sizeof(*var->default_values)))) { free_parse_variable_def(v); diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test index 4dbb2a8c..0d319f4d 100644 --- a/tests/hlsl/default-values.shader_test +++ b/tests/hlsl/default-values.shader_test @@ -320,3 +320,12 @@ float4 main() : sv_target { return u.y; } + +[pixel shader fail] +float a = 1; +int a = 2; + +float4 main() : sv_target +{ + return 0; +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Set default values for annotations variables.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 0f7ac0a054a11863c58c6167ad467fcb00c31495 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f7ac0a054a11863c58c6167ad467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 19:56:25 2024 +0200 vkd3d-shader/hlsl: Set default values for annotations variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.h | 3 +++ libs/vkd3d-shader/hlsl.y | 26 +++++++++++++++++++++++--- tests/hlsl/annotations.shader_test | 6 +++--- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c31a227c..c7f5ae86 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -388,6 +388,7 @@ struct hlsl_attribute #define HLSL_STORAGE_LINEAR 0x00010000 #define HLSL_MODIFIER_SINGLE 0x00020000 #define HLSL_MODIFIER_EXPORT 0x00040000 +#define HLSL_STORAGE_ANNOTATION 0x00080000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_MODIFIER_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ @@ -841,6 +842,8 @@ struct hlsl_scope bool loop; /* The scope was created for the switch statement. */ bool _switch; + /* The scope contains annotation variables. */ + bool annotations; }; struct hlsl_profile_info diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c7af2a10..95be7e08 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2625,7 +2625,8 @@ static struct hlsl_block *initialize_vars(struct hlsl_ctx *ctx, struct list *var unsigned int size, k; is_default_values_initializer = (ctx->cur_buffer != ctx->globals_buffer) - || (var->storage_modifiers & HLSL_STORAGE_UNIFORM); + || (var->storage_modifiers & HLSL_STORAGE_UNIFORM) + || ctx->cur_scope->annotations; if (is_default_values_initializer) { @@ -6058,19 +6059,31 @@ pass: annotations_list: variables_def_typed ';' + { + struct hlsl_block *block; + + block = initialize_vars(ctx, $1); + destroy_block(block); + } | annotations_list variables_def_typed ';' + { + struct hlsl_block *block; + + block = initialize_vars(ctx, $2); + destroy_block(block); + } annotations_opt: %empty { $$ = NULL; } - | '<' scope_start '>' + | '<' annotations_scope_start '>' { hlsl_pop_scope(ctx); $$ = NULL; } - | '<' scope_start annotations_list '>' + | '<' annotations_scope_start annotations_list '>' { struct hlsl_scope *scope = ctx->cur_scope; @@ -6598,6 +6611,13 @@ switch_scope_start: ctx->cur_scope->_switch = true; } +annotations_scope_start: + %empty + { + hlsl_push_scope(ctx); + ctx->cur_scope->annotations = true; + } + var_identifier: VAR_IDENTIFIER | NEW_IDENTIFIER diff --git a/tests/hlsl/annotations.shader_test b/tests/hlsl/annotations.shader_test index 4545f7ed..55a7e65e 100644 --- a/tests/hlsl/annotations.shader_test +++ b/tests/hlsl/annotations.shader_test @@ -70,7 +70,7 @@ technique10 // Without initializer technique10 < int a; > {} -[effect fail todo] +[effect fail] // Only numeric types and strings are allowed technique10 < DepthStencilState ds = { 0 }; > {} @@ -82,9 +82,9 @@ technique10 < struct s { int a; } var = { 2 }; > {} // Static modifier is not allowed technique10 < static int a = 5; > {} -[effect fail todo] +[effect fail] // Initializer should not depend on other annotations technique10 < int a = 1, b = a; > {} -[effect fail todo] +[effect fail] technique10 < int a = 1; int b = a; > {}

1 0

Nikolay Sivov : vkd3d-shader/fx: Write annotations for fx_4+ profiles.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 937a80ead66ce57698205f8b7d195aec85d7e527 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/937a80ead66ce57698205f8b7d195… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 15 23:44:08 2024 +0200 vkd3d-shader/fx: Write annotations for fx_4+ profiles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 81 +++++++++++++++++++++++++++++++------- tests/hlsl/annotations.shader_test | 2 +- 2 files changed, 68 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9acb1f79..75f10a18 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -63,6 +63,7 @@ struct fx_write_context_ops uint32_t (*write_string)(const char *string, struct fx_write_context *fx); void (*write_technique)(struct hlsl_ir_var *var, struct fx_write_context *fx); void (*write_pass)(struct hlsl_ir_var *var, struct fx_write_context *fx); + void (*write_annotation)(struct hlsl_ir_var *var, struct fx_write_context *fx); bool are_child_effects_supported; }; @@ -130,8 +131,41 @@ static void write_pass(struct hlsl_ir_var *var, struct fx_write_context *fx) fx->ops->write_pass(var, fx); } +static uint32_t write_annotations(struct hlsl_scope *scope, struct fx_write_context *fx) +{ + struct hlsl_ctx *ctx = fx->ctx; + struct hlsl_ir_var *v; + uint32_t count = 0; + + if (!scope) + return 0; + + LIST_FOR_EACH_ENTRY(v, &scope->vars, struct hlsl_ir_var, scope_entry) + { + if (!v->default_values) + hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, + "Annotation variable is missing default value."); + + fx->ops->write_annotation(v, fx); + ++count; + } + + return count; +} + +static void write_fx_4_annotations(struct hlsl_scope *scope, struct fx_write_context *fx) +{ + struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t count_offset, count; + + count_offset = put_u32(buffer, 0); + count = write_annotations(scope, fx); + set_u32(buffer, count_offset, count); +} + static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_context *fx); static const char * get_fx_4_type_name(const struct hlsl_type *type); +static void write_fx_4_annotation(struct hlsl_ir_var *var, struct fx_write_context *fx); static uint32_t write_type(const struct hlsl_type *type, struct fx_write_context *fx) { @@ -281,9 +315,9 @@ static void write_fx_4_pass(struct hlsl_ir_var *var, struct fx_write_context *fx name_offset = write_string(var->name, fx); put_u32(buffer, name_offset); put_u32(buffer, 0); /* Assignment count. */ - put_u32(buffer, 0); /* Annotation count. */ - /* TODO: annotations */ + write_fx_4_annotations(var->annotations, fx); + /* TODO: assignments */ } @@ -629,8 +663,9 @@ static void write_fx_4_technique(struct hlsl_ir_var *var, struct fx_write_contex name_offset = write_string(var->name, fx); put_u32(buffer, name_offset); count_offset = put_u32(buffer, 0); - put_u32(buffer, 0); /* Annotation count. */ + write_fx_4_annotations(var->annotations, fx); + count = 0; LIST_FOR_EACH_ENTRY(pass, &var->scope->vars, struct hlsl_ir_var, scope_entry) { write_pass(pass, fx); @@ -665,7 +700,7 @@ static void write_group(struct hlsl_ir_var *var, struct fx_write_context *fx) put_u32(buffer, name_offset); count_offset = put_u32(buffer, 0); /* Technique count */ - put_u32(buffer, 0); /* Annotation count */ + write_fx_4_annotations(var ? var->annotations : NULL, fx); count = fx->technique_count; write_techniques(var ? var->scope : fx->ctx->globals, fx); @@ -1026,6 +1061,7 @@ static const struct fx_write_context_ops fx_4_ops = .write_string = write_fx_4_string, .write_technique = write_fx_4_technique, .write_pass = write_fx_4_pass, + .write_annotation = write_fx_4_annotation, .are_child_effects_supported = true, }; @@ -1100,7 +1136,6 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, st { HAS_EXPLICIT_BIND_POINT = 0x4, }; - struct hlsl_ctx *ctx = fx->ctx; if (var->has_explicit_bind_point) flags |= HAS_EXPLICIT_BIND_POINT; @@ -1126,14 +1161,36 @@ static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, st uint32_t offset = write_fx_4_default_value(var->data_type, var->default_values, fx); set_u32(buffer, value_offset, offset); - put_u32(buffer, 0); /* Annotations count */ - if (has_annotations(var)) - hlsl_fixme(ctx, &ctx->location, "Writing annotations for numeric variables is not implemented."); + write_fx_4_annotations(var->annotations, fx); fx->numeric_variable_count++; } } +static void write_fx_4_annotation(struct hlsl_ir_var *var, struct fx_write_context *fx) +{ + const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type); + struct vkd3d_bytecode_buffer *buffer = &fx->structured; + uint32_t name_offset, type_offset, offset; + struct hlsl_ctx *ctx = fx->ctx; + + name_offset = write_string(var->name, fx); + type_offset = write_type(var->data_type, fx); + + put_u32(buffer, name_offset); + put_u32(buffer, type_offset); + + if (hlsl_is_numeric_type(type)) + { + offset = write_fx_4_default_value(var->data_type, var->default_values, fx); + put_u32(buffer, offset); + } + else + { + hlsl_fixme(ctx, &var->loc, "Writing annotations for type class %u is not implemented.", type->class); + } +} + struct rhs_named_value { const char *name; @@ -1654,9 +1711,7 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ type->e.numeric.type); } - put_u32(buffer, 0); /* Annotations count */ - if (has_annotations(var)) - hlsl_fixme(ctx, &ctx->location, "Writing annotations for object variables is not implemented."); + write_fx_4_annotations(var->annotations, fx); ++fx->object_variable_count; } @@ -1699,9 +1754,7 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx } else { - put_u32(buffer, 0); /* Annotations count */ - if (b->annotations) - hlsl_fixme(ctx, &b->loc, "Writing annotations for buffers is not implemented."); + write_fx_4_annotations(b->annotations, fx); ++fx->buffer_count; } diff --git a/tests/hlsl/annotations.shader_test b/tests/hlsl/annotations.shader_test index 55a7e65e..3f6739a5 100644 --- a/tests/hlsl/annotations.shader_test +++ b/tests/hlsl/annotations.shader_test @@ -66,7 +66,7 @@ technique10 pass < int a = 0; float a = 1.0; > {} } -[effect fail todo] +[effect fail] // Without initializer technique10 < int a; > {}

1 0

Nikolay Sivov : vkd3d-shader/fx: Add missing fields for structure types on fx_5_0.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 0a344bd3c94bfdf25f02d5284f9c37638c2156dd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a344bd3c94bfdf25f02d5284f9c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 30 23:39:30 2024 +0200 vkd3d-shader/fx: Add missing fields for structure types on fx_5_0. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index a467c236..9acb1f79 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -536,6 +536,12 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co put_u32_unaligned(buffer, field->offset); put_u32_unaligned(buffer, field->type); } + + if (ctx->profile->major_version == 5) + { + put_u32_unaligned(buffer, 0); /* Base class type */ + put_u32_unaligned(buffer, 0); /* Interface count */ + } } else if (type->class == HLSL_CLASS_TEXTURE) {

1 0

Nikolay Sivov : vkd3d-shader/fx: Preserve parsing order of initializer components.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: 8738e4662ed68b59047fbfb7614f71af09962491 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8738e4662ed68b59047fbfb7614f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 14 02:26:19 2024 +0200 vkd3d-shader/fx: Preserve parsing order of initializer components. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index b9f0deda..f5611e67 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2224,6 +2224,9 @@ static unsigned int get_component_index_from_default_initializer_index(struct hl if (ctx->profile->major_version < 4) return index; + if (ctx->profile->type == VKD3D_SHADER_TYPE_EFFECT) + return index; + switch (type->class) { case HLSL_CLASS_MATRIX:

1 0

Nikolay Sivov : vkd3d-shader/fx: Fix packed size for fx_4+ types.
by Alexandre Julliard July 8, 2024

July 8, 2024

Module: vkd3d Branch: master Commit: c97c652ff07a4c812fee64ee14b96ad0ec2ab89f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c97c652ff07a4c812fee64ee14b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 30 23:31:50 2024 +0200 vkd3d-shader/fx: Fix packed size for fx_4+ types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 558e3275..a467c236 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -433,8 +433,8 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co uint32_t offset; uint32_t type; }; + uint32_t name_offset, offset, total_size, packed_size, stride, numeric_desc; struct vkd3d_bytecode_buffer *buffer = &fx->unstructured; - uint32_t name_offset, offset, size, stride, numeric_desc; struct field_offsets *field_offsets = NULL; struct hlsl_ctx *ctx = fx->ctx; uint32_t elements_count = 0; @@ -507,15 +507,22 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co return 0; } - size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float); + /* Structures can only contain numeric fields, this is validated during variable declaration. */ + total_size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float); + packed_size = 0; + if (type->class == HLSL_CLASS_STRUCT || hlsl_is_numeric_type(type)) + packed_size = hlsl_type_component_count(type) * sizeof(float); if (elements_count) - size *= elements_count; + { + total_size *= elements_count; + packed_size *= elements_count; + } stride = align(stride, 4 * sizeof(float)); put_u32_unaligned(buffer, elements_count); - put_u32_unaligned(buffer, size); /* Total size. */ - put_u32_unaligned(buffer, stride); /* Stride. */ - put_u32_unaligned(buffer, size); + put_u32_unaligned(buffer, total_size); + put_u32_unaligned(buffer, stride); + put_u32_unaligned(buffer, packed_size); if (type->class == HLSL_CLASS_STRUCT) {

1 0