April 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Rename the "type" field of struct hlsl_type to "class".
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: 7a9e393ea0df29685f4c966781b4f66107148a28 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7a9e393ea0df29685f4c966781b4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 11 19:31:55 2022 -0600 vkd3d-shader/hlsl: Rename the "type" field of struct hlsl_type to "class". To be consistent with enum hlsl_type_class and HLSL_CLASS_*. --- libs/vkd3d-shader/hlsl.c | 70 ++++++------- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 186 +++++++++++++++++----------------- libs/vkd3d-shader/hlsl_codegen.c | 72 ++++++------- libs/vkd3d-shader/hlsl_constant_ops.c | 4 +- libs/vkd3d-shader/hlsl_sm1.c | 20 ++-- libs/vkd3d-shader/hlsl_sm4.c | 38 +++---- 7 files changed, 196 insertions(+), 196 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Improve handling of builtin alias type "vector".
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: b172f4c257a5cf9c5be72240ce928a90fa7f81c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b172f4c257a5cf9c5be72240ce928… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 15:25:06 2023 +0100 vkd3d-shader/hlsl: Improve handling of builtin alias type "vector". Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/hlsl-type-names.shader_test | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f84b60fe..4effb986 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -615,6 +615,7 @@ static const char * get_case_insensitive_typename(const char *name) "dword", "float", "matrix", + "vector", }; unsigned int i; @@ -2845,7 +2846,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) { {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_UINT, 1, 1}, {"float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, - {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, + {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"STRING", HLSL_CLASS_OBJECT, HLSL_TYPE_STRING, 1, 1}, {"TEXTURE", HLSL_CLASS_OBJECT, HLSL_TYPE_TEXTURE, 1, 1}, diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test index 69510b34..f382ffae 100644 --- a/tests/hlsl-type-names.shader_test +++ b/tests/hlsl-type-names.shader_test @@ -3,6 +3,7 @@ typedef float2 Dword; typedef float3 dWord; typedef float2 fLoat; typedef float2 mAtrix; +typedef float2 vEctor; float4 f() { @@ -14,6 +15,10 @@ float4 f() mAtrix v5 = {1, 2}; maTrix v6 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; matrix v7 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; + vector v8 = {1, 2, 3, 4}; + vEctor v9 = {1, 2}; + Vector v10 = {1, 2, 3, 4}; + vectoR v11 = {1, 2, 3, 4}; return float4(v1.x, v2.x, v2.y, v4); } @@ -80,6 +85,18 @@ float4 main() : SV_TARGET return f(); } +[pixel shader fail] +float4 f() +{ + typedef float2 vector; + return float4(0, 0, 0, 0); +} + +float4 main() : SV_TARGET +{ + return f(); +} + [pixel shader fail] Matrix<float, 2, 2> m; @@ -87,3 +104,11 @@ float4 main() : sv_target { return float4(0, 0, 0, 0); } + +[pixel shader fail] +Vector<float, 2> v; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Improve handling of builtin alias type "matrix".
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: 5b5c020ade430ad859837376772ce88174b15476 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b5c020ade430ad859837376772ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 24 11:39:45 2023 +0100 vkd3d-shader/hlsl: Improve handling of builtin alias type "matrix". --- libs/vkd3d-shader/hlsl.c | 3 ++- tests/hlsl-type-names.shader_test | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 64d6e870..f84b60fe 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -614,6 +614,7 @@ static const char * get_case_insensitive_typename(const char *name) { "dword", "float", + "matrix", }; unsigned int i; @@ -2845,7 +2846,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_UINT, 1, 1}, {"float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1}, {"VECTOR", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, - {"MATRIX", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, + {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"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}, diff --git a/tests/hlsl-type-names.shader_test b/tests/hlsl-type-names.shader_test index e88f1cda..69510b34 100644 --- a/tests/hlsl-type-names.shader_test +++ b/tests/hlsl-type-names.shader_test @@ -2,6 +2,7 @@ typedef float2 Dword; typedef float3 dWord; typedef float2 fLoat; +typedef float2 mAtrix; float4 f() { @@ -10,6 +11,9 @@ float4 f() dword v1 = {1, 2}; float v2 = {2, 3}; DWORD v4 = 4; + mAtrix v5 = {1, 2}; + maTrix v6 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; + matrix v7 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}; return float4(v1.x, v2.x, v2.y, v4); } @@ -55,3 +59,31 @@ float4 main() : sv_target { return float4(0, 0, 0, 0); } + +[pixel shader fail] +typedef float2 matrix; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +} + +[pixel shader fail] +float4 f() +{ + typedef float2 matrix; + return float4(0, 0, 0, 0); +} + +float4 main() : SV_TARGET +{ + return f(); +} + +[pixel shader fail] +Matrix<float, 2, 2> m; + +float4 main() : sv_target +{ + return float4(0, 0, 0, 0); +}

1 0

Conor McCarthy : vkd3d-shader/trace: Trace the normalised instruction array after tracing the input.
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: 16a7de4b38617a5f95ef1b4da5af31ba28aeef8d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/16a7de4b38617a5f95ef1b4da5af3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 23 13:47:03 2023 +1000 vkd3d-shader/trace: Trace the normalised instruction array after tracing the input. --- libs/vkd3d-shader/spirv.c | 3 +++ libs/vkd3d-shader/trace.c | 17 +++++++++-------- libs/vkd3d-shader/vkd3d_shader_main.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 8 +++++--- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 065f3f78..7c6332ce 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9892,6 +9892,9 @@ int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, shader_normaliser_init(&normaliser, instructions); result = shader_normaliser_flatten_hull_shader_phases(&normaliser); instructions = &normaliser.instructions; + + if (result >= 0 && TRACE_ON()) + vkd3d_shader_trace(instructions, &parser->shader_version); } for (i = 0; i < instructions->count && result >= 0; ++i) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 6cd2dcb2..d17a2819 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1857,11 +1857,11 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "\n"); } -enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) +enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vkd3d_shader_instruction_array *instructions, + const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out) { enum vkd3d_shader_compile_option_formatting_flags formatting; - struct vkd3d_shader_version *shader_version; struct vkd3d_d3d_asm_compiler compiler; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; @@ -1919,16 +1919,16 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, buffer = &compiler.buffer; vkd3d_string_buffer_init(buffer); + compiler.shader_version = *shader_version; shader_version = &compiler.shader_version; - *shader_version = parser->shader_version; vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor, compiler.colours.reset); indent = 0; - for (i = 0; i < parser->instructions.count; ++i) + for (i = 0; i < instructions->count; ++i) { - struct vkd3d_shader_instruction *ins = &parser->instructions.elements[i]; + struct vkd3d_shader_instruction *ins = &instructions->elements[i]; switch (ins->handler_idx) { @@ -1981,12 +1981,13 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, return result; } -void vkd3d_shader_trace(struct vkd3d_shader_parser *parser) +void vkd3d_shader_trace(const struct vkd3d_shader_instruction_array *instructions, + const struct vkd3d_shader_version *shader_version) { const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(parser, NULL, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(instructions, shader_version, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 405f5f0e..1b41fa34 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1072,7 +1072,7 @@ static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info if (TRACE_ON()) { - vkd3d_shader_trace(parser); + vkd3d_shader_trace(&parser->instructions, &parser->shader_version); } for (i = 0; i < parser->instructions.count; ++i) @@ -1198,7 +1198,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(parser, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); vkd3d_shader_parser_destroy(parser); return ret; } @@ -1272,7 +1272,7 @@ static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_ if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { - ret = vkd3d_dxbc_binary_to_text(parser, compile_info, out); + ret = vkd3d_dxbc_binary_to_text(&parser->instructions, &parser->shader_version, compile_info, out); vkd3d_shader_parser_destroy(parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 3cb90f95..d1a4aa1d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1030,7 +1030,8 @@ static inline void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parse parser->ops->parser_destroy(parser); } -void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); +void vkd3d_shader_trace(const struct vkd3d_shader_instruction_array *instructions, + const struct vkd3d_shader_version *shader_version); const char *shader_get_type_prefix(enum vkd3d_shader_type type); @@ -1046,8 +1047,9 @@ struct vkd3d_string_buffer_cache size_t count, max_count, capacity; }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, - const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out); +enum vkd3d_result vkd3d_dxbc_binary_to_text(const struct vkd3d_shader_instruction_array *instructions, + const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out); void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer);

1 0

Conor McCarthy : vkd3d-shader/spirv: Remove the hull shader phase array.
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: b8472d2270ba67b82038dfe5785993c38d48bdce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b8472d2270ba67b82038dfe578599… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 23 13:58:17 2023 +1000 vkd3d-shader/spirv: Remove the hull shader phase array. With no more than one phase each of control point and fork/join type, an array is not required. --- libs/vkd3d-shader/spirv.c | 143 ++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 93 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/spirv: Declare the phase SPIR-V function in spirv_compiler_enter_shader_phase().
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: c61f9f477cae3187bf09aa21d4e1f1681d722176 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c61f9f477cae3187bf09aa21d4e1f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 23 14:07:42 2023 +1000 vkd3d-shader/spirv: Declare the phase SPIR-V function in spirv_compiler_enter_shader_phase(). The convoluted code path is no longer needed. --- libs/vkd3d-shader/spirv.c | 48 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6d305eee..ddd77ffb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4330,38 +4330,13 @@ static void spirv_compiler_emit_shader_phase_name(struct spirv_compiler *compile vkd3d_spirv_build_op_name(builder, id, "%s%s", name, suffix); } -static void spirv_compiler_begin_shader_phase(struct spirv_compiler *compiler, - struct vkd3d_shader_phase *phase) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t void_id, function_type_id; - uint32_t param_type_id; - - phase->function_id = vkd3d_spirv_alloc_id(builder); - - void_id = vkd3d_spirv_get_op_type_void(builder); - function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, 0); - vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, - SpvFunctionControlMaskNone, function_type_id); - - vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); - phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - - spirv_compiler_emit_shader_phase_name(compiler, phase->function_id, NULL); -} - static const struct vkd3d_shader_phase *spirv_compiler_get_current_shader_phase( struct spirv_compiler *compiler) { - struct vkd3d_shader_phase *phase; - if (is_in_default_phase(compiler)) return NULL; - phase = is_in_control_point_phase(compiler) ? &compiler->control_point_phase : &compiler->patch_constant_phase; - if (!phase->function_id) - spirv_compiler_begin_shader_phase(compiler, phase); - return phase; + return is_in_control_point_phase(compiler) ? &compiler->control_point_phase : &compiler->patch_constant_phase; } static void spirv_compiler_decorate_xfb_output(struct spirv_compiler *compiler, @@ -6533,12 +6508,31 @@ static void spirv_compiler_leave_shader_phase(struct spirv_compiler *compiler) static void spirv_compiler_enter_shader_phase(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t function_id, void_id, function_type_id; + struct vkd3d_shader_phase *phase; + assert(compiler->phase != instruction->handler_idx); - if (spirv_compiler_get_current_shader_phase(compiler)) + if (!is_in_default_phase(compiler)) spirv_compiler_leave_shader_phase(compiler); + function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + vkd3d_spirv_build_op_function(builder, void_id, function_id, + SpvFunctionControlMaskNone, function_type_id); + + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + compiler->phase = instruction->handler_idx; + spirv_compiler_emit_shader_phase_name(compiler, function_id, NULL); + + phase = (instruction->handler_idx == VKD3DSIH_HS_CONTROL_POINT_PHASE) + ? &compiler->control_point_phase : &compiler->patch_constant_phase; + phase->function_id = function_id; + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); } static void spirv_compiler_emit_default_control_point_phase(struct spirv_compiler *compiler)

1 0

Conor McCarthy : vkd3d-shader/ir: Merge all shader IR fork and join phases into a single phase.
by Alexandre Julliard April 3, 2023

April 3, 2023

Module: vkd3d Branch: master Commit: eabdccb117f8bb08ea03289a21049ae04aa18adf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eabdccb117f8bb08ea03289a21049… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Mar 1 11:59:28 2023 +1000 vkd3d-shader/ir: Merge all shader IR fork and join phases into a single phase. Normalise the incoming vkd3d_shader_instruction IR to the shader model 6 pattern. This allows generation of a single patch constant function in SPIR-V. --- Makefile.am | 1 + libs/vkd3d-shader/ir.c | 264 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 148 +++++------------ libs/vkd3d-shader/vkd3d_shader_main.c | 78 +++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 19 +++ 5 files changed, 405 insertions(+), 105 deletions(-)

1 0