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

Henri Verbeet : vkd3d-shader/glsl: Add vkd3d-shader version information to the generated shader.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 414bb99542c359cca724f466bad43db3ed61ea41 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/414bb99542c359cca724f466bad43… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 21 19:28:22 2021 +0200 vkd3d-shader/glsl: Add vkd3d-shader version information to the generated shader. --- libs/vkd3d-shader/glsl.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index f1012d06..3e8dd2c4 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -89,35 +89,39 @@ static void vkd3d_glsl_handle_instruction(struct vkd3d_glsl_generator *generator } } -static int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, struct vkd3d_shader_code *out) +static int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *gen, struct vkd3d_shader_code *out) { - const struct vkd3d_shader_instruction_array *instructions = &generator->program->instructions; + const struct vkd3d_shader_instruction_array *instructions = &gen->program->instructions; + struct vkd3d_string_buffer *buffer = &gen->buffer; unsigned int i; void *code; ERR("Generating a GLSL shader. This is unsupported; you get to keep all the pieces if it breaks.\n"); - vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); - vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); + vkd3d_string_buffer_printf(buffer, "#version 440\n\n"); - ++generator->indent; + vkd3d_string_buffer_printf(buffer, "/* Generated by %s. */\n\n", vkd3d_shader_get_version(NULL, NULL)); + + vkd3d_string_buffer_printf(buffer, "void main()\n{\n"); + + ++gen->indent; for (i = 0; i < instructions->count; ++i) { - vkd3d_glsl_handle_instruction(generator, &instructions->elements[i]); + vkd3d_glsl_handle_instruction(gen, &instructions->elements[i]); } - vkd3d_string_buffer_printf(&generator->buffer, "}\n"); + vkd3d_string_buffer_printf(buffer, "}\n"); if (TRACE_ON()) - vkd3d_string_buffer_trace(&generator->buffer); + vkd3d_string_buffer_trace(buffer); - if (generator->failed) + if (gen->failed) return VKD3D_ERROR_INVALID_SHADER; - if ((code = vkd3d_malloc(generator->buffer.buffer_size))) + if ((code = vkd3d_malloc(buffer->buffer_size))) { - memcpy(code, generator->buffer.buffer, generator->buffer.content_size); - out->size = generator->buffer.content_size; + memcpy(code, buffer->buffer, buffer->content_size); + out->size = buffer->content_size; out->code = code; } else return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Henri Verbeet : vkd3d-shader/hlsl: Support d3d-asm as target format.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 0116e49d9b21b61296f170551d85786e071cf854 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0116e49d9b21b61296f170551d857… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 17 20:12:59 2024 +0200 vkd3d-shader/hlsl: Support d3d-asm as target format. --- libs/vkd3d-shader/hlsl.c | 41 ++++++++++++++++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 3 ++- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +++ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ad6a443b..a6a70d4b 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3814,6 +3814,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { + enum vkd3d_shader_target_type target_type = compile_info->target_type; const struct vkd3d_shader_hlsl_source_info *hlsl_source_info; struct hlsl_ir_function_decl *decl, *entry_func = NULL; const struct hlsl_profile_info *profile; @@ -3835,25 +3836,25 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_NOT_IMPLEMENTED; } - if (compile_info->target_type != VKD3D_SHADER_TARGET_FX && profile->type == VKD3D_SHADER_TYPE_EFFECT) + if (target_type != VKD3D_SHADER_TARGET_FX && profile->type == VKD3D_SHADER_TYPE_EFFECT) { vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, "The '%s' target profile is only compatible with the 'fx' target type.", profile->name); return VKD3D_ERROR_INVALID_ARGUMENT; } - else if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) + else if (target_type == VKD3D_SHADER_TARGET_D3D_BYTECODE && profile->major_version > 3) { vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, "The '%s' target profile is incompatible with the 'd3dbc' target type.", profile->name); return VKD3D_ERROR_INVALID_ARGUMENT; } - else if (compile_info->target_type == VKD3D_SHADER_TARGET_DXBC_TPF && profile->major_version < 4) + else if (target_type == VKD3D_SHADER_TARGET_DXBC_TPF && profile->major_version < 4) { vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, "The '%s' target profile is incompatible with the 'dxbc-tpf' target type.", profile->name); return VKD3D_ERROR_INVALID_ARGUMENT; } - else if (compile_info->target_type == VKD3D_SHADER_TARGET_FX && profile->type != VKD3D_SHADER_TYPE_EFFECT) + else if (target_type == VKD3D_SHADER_TARGET_FX && profile->type != VKD3D_SHADER_TYPE_EFFECT) { vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE, "The '%s' target profile is incompatible with the 'fx' target type.", profile->name); @@ -3917,8 +3918,38 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - ret = hlsl_emit_bytecode(&ctx, entry_func, compile_info->target_type, out); + if (target_type == VKD3D_SHADER_TARGET_D3D_ASM) + { + struct vkd3d_shader_compile_info info = *compile_info; + struct vkd3d_shader_parser *parser; + + if (profile->major_version < 4) + { + if ((ret = hlsl_emit_bytecode(&ctx, entry_func, VKD3D_SHADER_TARGET_D3D_BYTECODE, &info.source)) < 0) + goto done; + info.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + ret = vkd3d_shader_sm1_parser_create(&info, message_context, &parser); + } + else + { + if ((ret = hlsl_emit_bytecode(&ctx, entry_func, VKD3D_SHADER_TARGET_DXBC_TPF, &info.source)) < 0) + goto done; + info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + ret = vkd3d_shader_sm4_parser_create(&info, message_context, &parser); + } + if (ret >= 0) + { + ret = vkd3d_shader_parser_compile(parser, &info, out, message_context); + vkd3d_shader_parser_destroy(parser); + } + vkd3d_shader_free_shader_code(&info.source); + } + else + { + ret = hlsl_emit_bytecode(&ctx, entry_func, target_type, out); + } +done: hlsl_ctx_cleanup(&ctx); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 43bf5f6f..a418fdc1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1556,7 +1556,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char return ret; } -static int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, +int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) { @@ -1879,6 +1879,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( static const enum vkd3d_shader_target_type hlsl_types[] = { + VKD3D_SHADER_TARGET_D3D_ASM, VKD3D_SHADER_TARGET_D3D_BYTECODE, VKD3D_SHADER_TARGET_DXBC_TPF, VKD3D_SHADER_TARGET_FX, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cfd3de2c..302d4f08 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1373,6 +1373,9 @@ struct vkd3d_shader_parser_ops void (*parser_destroy)(struct vkd3d_shader_parser *parser); }; +int vkd3d_shader_parser_compile(struct vkd3d_shader_parser *parser, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, + struct vkd3d_shader_message_context *message_context); void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser,

1 0

Henri Verbeet : vkd3d-shader/hlsl: Support spirv-binary and spirv-text as target formats.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 4a209efb6278586d412ceb0a7cbe21e6769a7367 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4a209efb6278586d412ceb0a7cbe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 16:36:21 2024 +0200 vkd3d-shader/hlsl: Support spirv-binary and spirv-text as target formats. --- libs/vkd3d-shader/hlsl.c | 4 +++- libs/vkd3d-shader/vkd3d_shader_main.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a6a70d4b..5dd80ff1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3918,7 +3918,9 @@ int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d return VKD3D_ERROR_INVALID_SHADER; } - if (target_type == VKD3D_SHADER_TARGET_D3D_ASM) + if (target_type == VKD3D_SHADER_TARGET_SPIRV_BINARY + || target_type == VKD3D_SHADER_TARGET_SPIRV_TEXT + || target_type == VKD3D_SHADER_TARGET_D3D_ASM) { struct vkd3d_shader_compile_info info = *compile_info; struct vkd3d_shader_parser *parser; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index a418fdc1..4342a176 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1879,6 +1879,10 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( static const enum vkd3d_shader_target_type hlsl_types[] = { + VKD3D_SHADER_TARGET_SPIRV_BINARY, +#ifdef HAVE_SPIRV_TOOLS + VKD3D_SHADER_TARGET_SPIRV_TEXT, +#endif VKD3D_SHADER_TARGET_D3D_ASM, VKD3D_SHADER_TARGET_D3D_BYTECODE, VKD3D_SHADER_TARGET_DXBC_TPF,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_VOID into a separate class.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: cdcf2da2ebd2911fb29e02acaf0279db0852c5ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cdcf2da2ebd2911fb29e02acaf027… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 9 16:42:00 2024 -0500 vkd3d-shader/hlsl: Make HLSL_TYPE_VOID into a separate class. --- libs/vkd3d-shader/d3dbc.c | 12 ++++---- libs/vkd3d-shader/fx.c | 8 ++++++ libs/vkd3d-shader/hlsl.c | 61 ++++++++++++++++++++++++++++++++-------- libs/vkd3d-shader/hlsl.h | 4 +-- libs/vkd3d-shader/hlsl_codegen.c | 3 ++ libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 71 insertions(+), 18 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 4685afa0..d5374909 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1514,10 +1514,11 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) return D3DXPC_STRUCT; case HLSL_CLASS_VECTOR: return D3DXPC_VECTOR; - default: - ERR("Invalid class %#x.\n", type->class); - vkd3d_unreachable(); + case HLSL_CLASS_VOID: + break; } + + vkd3d_unreachable(); } D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) @@ -1595,8 +1596,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) break; case HLSL_TYPE_VERTEXSHADER: return D3DXPT_VERTEXSHADER; - case HLSL_TYPE_VOID: - return D3DXPT_VOID; default: vkd3d_unreachable(); } @@ -1607,6 +1606,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_STRUCT: return D3DXPT_VOID; + + case HLSL_CLASS_VOID: + break; } vkd3d_unreachable(); diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 1d90cd70..c94552da 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -436,6 +436,11 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_ARRAY: vkd3d_unreachable(); + + case HLSL_CLASS_VOID: + FIXME("Writing type class %u is not implemented.\n", type->class); + set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); + return 0; } size = stride = type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float); @@ -814,6 +819,9 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type default: return false; } + + case HLSL_CLASS_VOID: + return false; } vkd3d_unreachable(); diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ed80e2b7..6859e1a3 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -365,6 +365,9 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type } break; } + + case HLSL_CLASS_VOID: + break; } } @@ -377,6 +380,25 @@ unsigned int hlsl_type_get_array_element_reg_size(const struct hlsl_type *type, return type->reg_size[regset]; } +static struct hlsl_type *hlsl_new_simple_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class class) +{ + struct hlsl_type *type; + + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) + return NULL; + if (!(type->name = hlsl_strdup(ctx, name))) + { + vkd3d_free(type); + return NULL; + } + type->class = class; + hlsl_type_calculate_reg_size(ctx, type); + + list_add_tail(&ctx->types, &type->entry); + + return type; +} + static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { @@ -402,7 +424,22 @@ static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, e static bool type_is_single_component(const struct hlsl_type *type) { - return type->class == HLSL_CLASS_SCALAR || type->class == HLSL_CLASS_OBJECT; + switch (type->class) + { + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_OBJECT: + return true; + + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + case HLSL_CLASS_STRUCT: + case HLSL_CLASS_ARRAY: + return false; + + case HLSL_CLASS_VOID: + break; + } + vkd3d_unreachable(); } /* Given a type and a component index, this function moves one step through the path required to @@ -525,7 +562,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty assert(idx == 0); break; - default: + case HLSL_CLASS_VOID: vkd3d_unreachable(); } type = next_type; @@ -752,7 +789,6 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; type->class = HLSL_CLASS_STRUCT; - type->base_type = HLSL_TYPE_VOID; type->name = name; type->dimy = 1; type->e.record.fields = fields; @@ -896,9 +932,11 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) case HLSL_CLASS_OBJECT: return 1; - default: - vkd3d_unreachable(); + case HLSL_CLASS_VOID: + break; } + + vkd3d_unreachable(); } bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) @@ -2313,15 +2351,16 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru return string; default: - vkd3d_string_buffer_printf(string, "<unexpected type>"); - return string; + break; } } - default: - vkd3d_string_buffer_printf(string, "<unexpected type>"); - return string; + case HLSL_CLASS_VOID: + break; } + + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } struct vkd3d_string_buffer *hlsl_component_to_string(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var, @@ -3609,7 +3648,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) ctx->builtin_types.sampler[bt] = type; } - ctx->builtin_types.Void = hlsl_new_type(ctx, "void", HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + ctx->builtin_types.Void = hlsl_new_simple_type(ctx, "void", HLSL_CLASS_VOID); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3cb98b76..b09b44c2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -79,6 +79,7 @@ enum hlsl_type_class HLSL_CLASS_STRUCT, HLSL_CLASS_ARRAY, HLSL_CLASS_OBJECT, + HLSL_CLASS_VOID, }; enum hlsl_base_type @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, HLSL_TYPE_STRING, - HLSL_TYPE_VOID, }; enum hlsl_sampler_dim @@ -175,7 +175,7 @@ struct hlsl_type * If base_type is HLSL_TYPE_SAMPLER, then both dimx = 1 and dimy = 1. * If base_type is HLSL_TYPE_TEXTURE, then dimx = 4 and dimy = 1. * If base_type is HLSL_TYPE_UAV, then dimx is the dimx of e.resource_format, and dimy = 1. - * Otherwise both dimx = 1 and dimy = 1. */ + */ unsigned int dimx; unsigned int dimy; /* Sample count for HLSL_SAMPLER_DIM_2DMS or HLSL_SAMPLER_DIM_2DMSARRAY. */ diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index eaa72836..511b1a66 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1634,6 +1634,9 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, /* FIXME: Actually we shouldn't even get here, but we don't split * matrices yet. */ return false; + + case HLSL_CLASS_VOID: + vkd3d_unreachable(); } if (copy_propagation_replace_with_constant_vector(ctx, state, load, HLSL_SWIZZLE(X, Y, Z, W), &load->node)) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d5019a5d..d0f0111f 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3008,6 +3008,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_ARRAY: case HLSL_CLASS_STRUCT: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_VOID: break; } vkd3d_unreachable();

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_STRING into a separate class.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: f57db442b00df9d3748b87f35dcff1a79c1f0916 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f57db442b00df9d3748b87f35dcff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:04:02 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_STRING into a separate class. --- libs/vkd3d-shader/d3dbc.c | 10 ++++++---- libs/vkd3d-shader/fx.c | 6 +++++- libs/vkd3d-shader/hlsl.c | 7 ++++++- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index d5374909..61f0f5cb 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1506,14 +1506,15 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) return D3DXPC_MATRIX_COLUMNS; else return D3DXPC_MATRIX_ROWS; - case HLSL_CLASS_OBJECT: - return D3DXPC_OBJECT; case HLSL_CLASS_SCALAR: return D3DXPC_SCALAR; case HLSL_CLASS_STRUCT: return D3DXPC_STRUCT; case HLSL_CLASS_VECTOR: return D3DXPC_VECTOR; + case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: + return D3DXPC_OBJECT; case HLSL_CLASS_VOID: break; } @@ -1574,8 +1575,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) vkd3d_unreachable(); } break; - case HLSL_TYPE_STRING: - return D3DXPT_STRING; case HLSL_TYPE_TEXTURE: switch (type->sampler_dim) { @@ -1607,6 +1606,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_STRUCT: return D3DXPT_VOID; + case HLSL_CLASS_STRING: + return D3DXPT_STRING; + case HLSL_CLASS_VOID: break; } diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index c94552da..e5770f10 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -437,6 +437,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_ARRAY: vkd3d_unreachable(); + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: FIXME("Writing type class %u is not implemented.\n", type->class); set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); @@ -810,7 +811,6 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type break; case HLSL_TYPE_SAMPLER: - case HLSL_TYPE_STRING: case HLSL_TYPE_PIXELSHADER: case HLSL_TYPE_VERTEXSHADER: hlsl_fixme(ctx, loc, "Write fx 2.0 parameter object type %#x.", type->base_type); @@ -820,6 +820,10 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type return false; } + case HLSL_CLASS_STRING: + hlsl_fixme(ctx, loc, "Write fx 2.0 parameter class %#x.", type->class); + return false; + case HLSL_CLASS_VOID: return false; } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 6859e1a3..c3170ff7 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -366,6 +366,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type break; } + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; } @@ -428,6 +429,7 @@ static bool type_is_single_component(const struct hlsl_type *type) { case HLSL_CLASS_SCALAR: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: return true; case HLSL_CLASS_VECTOR: @@ -559,6 +561,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty break; case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: assert(idx == 0); break; @@ -930,6 +933,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) return hlsl_type_component_count(type->e.array.type) * type->e.array.elements_count; case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: return 1; case HLSL_CLASS_VOID: @@ -2355,6 +2359,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru } } + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; } @@ -3532,7 +3537,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"fxgroup", HLSL_CLASS_OBJECT, HLSL_TYPE_EFFECT_GROUP, 1, 1}, {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, - {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"texture", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, @@ -3649,6 +3653,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) } ctx->builtin_types.Void = hlsl_new_simple_type(ctx, "void", HLSL_CLASS_VOID); + hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING)); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b09b44c2..83679767 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -79,6 +79,7 @@ enum hlsl_type_class HLSL_CLASS_STRUCT, HLSL_CLASS_ARRAY, HLSL_CLASS_OBJECT, + HLSL_CLASS_STRING, HLSL_CLASS_VOID, }; @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_DEPTHSTENCILVIEW, HLSL_TYPE_TECHNIQUE, HLSL_TYPE_EFFECT_GROUP, - HLSL_TYPE_STRING, }; enum hlsl_sampler_dim diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 511b1a66..e1064b99 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1635,6 +1635,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, * matrices yet. */ return false; + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: vkd3d_unreachable(); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index d0f0111f..4bacbefd 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3008,6 +3008,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_ARRAY: case HLSL_CLASS_STRUCT: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_SAMPLER into a separate class.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 220362cbadfff0d28cef8190565110d29ce3a662 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/220362cbadfff0d28cef819056511… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:13:17 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_SAMPLER into a separate class. --- libs/vkd3d-shader/d3dbc.c | 38 +++++++++--------- libs/vkd3d-shader/fx.c | 29 ++++++++------ libs/vkd3d-shader/hlsl.c | 85 ++++++++++++++++++++++++---------------- libs/vkd3d-shader/hlsl.h | 5 +-- libs/vkd3d-shader/hlsl.y | 17 +++----- libs/vkd3d-shader/hlsl_codegen.c | 3 +- libs/vkd3d-shader/tpf.c | 29 +++++++++----- 7 files changed, 119 insertions(+), 87 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_TEXTURE into a separate class.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 93d7cd178583ebd6ebe68471f91853aa5b81f403 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/93d7cd178583ebd6ebe68471f9185… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:25:57 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_TEXTURE into a separate class. --- libs/vkd3d-shader/d3dbc.c | 38 +++++++------- libs/vkd3d-shader/fx.c | 88 ++++++++++++++++++------------- libs/vkd3d-shader/hlsl.c | 109 +++++++++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 5 +- libs/vkd3d-shader/hlsl.y | 11 ++-- libs/vkd3d-shader/hlsl_codegen.c | 3 +- libs/vkd3d-shader/tpf.c | 7 +-- 7 files changed, 143 insertions(+), 118 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_UAV into a separate class.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: vkd3d Branch: master Commit: 171e097268c6fc0191e9f71d418dfe4ffaffe582 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/171e097268c6fc0191e9f71d418df… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 5 20:32:37 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_UAV into a separate class. --- libs/vkd3d-shader/d3dbc.c | 2 + libs/vkd3d-shader/fx.c | 32 ++++++++------ libs/vkd3d-shader/hlsl.c | 94 ++++++++++++++-------------------------- libs/vkd3d-shader/hlsl.h | 10 ++--- libs/vkd3d-shader/hlsl.y | 8 ++-- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 12 ++--- 7 files changed, 63 insertions(+), 96 deletions(-)

1 0

Alexandre Julliard : rpcrt4: Leave some space on the stack for varargs when called from ARM64EC code.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: wine Branch: master Commit: 3c8fc4927d7253c06aeb7147da759a2f3d5ff171 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c8fc4927d7253c06aeb7147da759a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 19 14:52:03 2024 +0200 rpcrt4: Leave some space on the stack for varargs when called from ARM64EC code. --- dlls/rpcrt4/ndr_stubless.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index dc0ef58e280..cbb8b617912 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1017,14 +1017,14 @@ __ASM_GLOBAL_FUNC( NdrClientCall2, CLIENT_CALL_RETURN __attribute__((naked)) NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING fmt, ... ) { asm( ".seh_proc \"#NdrClientCall2\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "stp x2, x3, [x4, #-0x10]!\n\t" "mov x2, x4\n\t" /* stack */ "mov x3, #0\n\t" /* fpu_stack */ "bl \"#NdrpClientCall2\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); } @@ -1981,14 +1981,14 @@ __ASM_GLOBAL_FUNC( NdrAsyncClientCall, CLIENT_CALL_RETURN __attribute__((naked)) NdrAsyncClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING fmt, ... ) { asm( ".seh_proc \"#NdrAsyncClientCall\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "stp x2, x3, [x4, #-0x10]!\n\t" "mov x2, x4\n\t" /* stack */ "mov x3, #0\n\t" /* fpu_stack */ "bl \"#ndr_async_client_call\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); } @@ -2365,14 +2365,14 @@ __ASM_GLOBAL_FUNC( NdrClientCall3, CLIENT_CALL_RETURN __attribute__((naked)) NdrClientCall3( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) { asm( ".seh_proc \"#NdrClientCall3\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "str x3, [x4, #-0x8]!\n\t" "mov x3, x4\n\t" /* stack */ "mov x4, #0\n\t" /* fpu_stack */ "bl \"#ndr64_client_call\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); } @@ -2437,14 +2437,14 @@ __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, CLIENT_CALL_RETURN __attribute__((naked)) Ndr64AsyncClientCall( MIDL_STUBLESS_PROXY_INFO *info, ULONG proc, void *retval, ... ) { asm( ".seh_proc \"#Ndr64AsyncClientCall\"\n\t" - "stp x29, x30, [sp, #-0x10]!\n\t" - ".seh_save_fplr_x 0x10\n\t" + "stp x29, x30, [sp, #-0x20]!\n\t" + ".seh_save_fplr_x 0x20\n\t" ".seh_endprologue\n\t" "str x3, [x4, #-0x8]!\n\t" "mov x3, x4\n\t" /* stack */ "mov x4, #0\n\t" /* fpu_stack */ "bl \"#ndr64_async_client_call\"\n\t" - "ldp x29, x30, [sp], #0x10\n\t" + "ldp x29, x30, [sp], #0x20\n\t" "ret\n\t" ".seh_endproc" ); }

1 0

Alexandre Julliard : Release 9.7.
by Alexandre Julliard 19 Apr '24

19 Apr '24

Module: wine Branch: master Commit: 166895ae3ad3890ad946a309d0fd85e89ea3630e URL: https://gitlab.winehq.org/wine/wine/-/commit/166895ae3ad3890ad946a309d0fd85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 19 22:18:13 2024 +0200 Release 9.7. --- ANNOUNCE.md | 417 ++++++++++++++++++++++++++++-------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +-- 4 files changed, 203 insertions(+), 236 deletions(-)

1 0