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

Giovanni Mascellani : vkd3d-shader/ir: Materialize SSAs in each function of a hull shader.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: 6b841486d430dd9d53acca5c2fbe589cc9adaefb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b841486d430dd9d53acca5c2fbe5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 12 16:19:49 2024 +0200 vkd3d-shader/ir: Materialize SSAs in each function of a hull shader. --- libs/vkd3d-shader/ir.c | 65 ++++++++++++++++++++++++++++--------- tests/hlsl/tessellation.shader_test | 2 +- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index b0bd99f9..62292f16 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3098,6 +3098,8 @@ struct vsir_cfg { struct vkd3d_shader_message_context *message_context; struct vsir_program *program; + size_t function_begin; + size_t function_end; struct vsir_block *blocks; struct vsir_block *entry; size_t block_count; @@ -3354,6 +3356,7 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program cfg->program = program; cfg->block_count = program->block_count; cfg->target = target; + cfg->function_begin = *pos; vsir_block_list_init(&cfg->order); @@ -3414,6 +3417,7 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program } *pos = i; + cfg->function_end = *pos; for (i = 0; i < cfg->block_count; ++i) { @@ -5063,7 +5067,7 @@ static enum vkd3d_result vsir_cfg_materialize_undominated_ssas_to_temps(struct v TRACE("Emitting temps for %u values with undominated usage.\n", alloc.next_temp_idx - program->temp_count); - for (i = 0; i < program->instructions.count; ++i) + for (i = cfg->function_begin; i < cfg->function_end; ++i) { struct vkd3d_shader_instruction *ins = &program->instructions.elements[i]; @@ -5082,26 +5086,16 @@ done: return VKD3D_OK; } -static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(struct vsir_program *program, - struct vkd3d_shader_message_context *message_context) +static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps_in_function( + struct vsir_program *program, struct vkd3d_shader_message_context *message_context, + size_t *pos) { enum vkd3d_result ret; struct vsir_cfg cfg; - size_t stop_pos = 0; - if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) - { - FIXME("Hull shaders are not supported.\n"); - vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, - "The structurizer does not support hull shaders."); - return VKD3D_ERROR_INVALID_SHADER; - } - - if ((ret = vsir_cfg_init(&cfg, program, message_context, NULL, &stop_pos)) < 0) + if ((ret = vsir_cfg_init(&cfg, program, message_context, NULL, pos)) < 0) return ret; - assert(stop_pos == program->instructions.count); - vsir_cfg_compute_dominators(&cfg); ret = vsir_cfg_materialize_undominated_ssas_to_temps(&cfg); @@ -5111,6 +5105,47 @@ static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(stru return ret; } +static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) +{ + enum vkd3d_result ret; + size_t i; + + for (i = 0; i < program->instructions.count;) + { + struct vkd3d_shader_instruction *ins = &program->instructions.elements[i]; + + switch (ins->handler_idx) + { + case VKD3DSIH_LABEL: + assert(program->shader_version.type != VKD3D_SHADER_TYPE_HULL); + TRACE("Materializing undominated SSAs in a non-hull shader.\n"); + if ((ret = vsir_program_materialize_undominated_ssas_to_temps_in_function( + program, message_context, &i)) < 0) + return ret; + assert(i == program->instructions.count); + break; + + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + assert(program->shader_version.type == VKD3D_SHADER_TYPE_HULL); + TRACE("Materializing undominated SSAs in phase %u of a hull shader.\n", ins->handler_idx); + ++i; + if ((ret = vsir_program_materialize_undominated_ssas_to_temps_in_function( + program, message_context, &i)) < 0) + return ret; + break; + + default: + ++i; + break; + } + } + + return VKD3D_OK; +} + struct validation_context { struct vkd3d_shader_message_context *message_context; diff --git a/tests/hlsl/tessellation.shader_test b/tests/hlsl/tessellation.shader_test index d8b26347..77bc49ee 100644 --- a/tests/hlsl/tessellation.shader_test +++ b/tests/hlsl/tessellation.shader_test @@ -94,5 +94,5 @@ float4 main(data input) : sv_target } [test] -todo draw 3 control point patch list 3 +todo(sm<6) draw 3 control point patch list 3 probe all rgba (0.0, 1.0, 0.0, 1.0)

1 0

Giovanni Mascellani : vkd3d-shader/ir: Structurize each function of a hull shader.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: c8af142bb0ba4bc6d4a3e516fbc6d4696e142440 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8af142bb0ba4bc6d4a3e516fbc6d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 11 16:33:19 2024 +0200 vkd3d-shader/ir: Structurize each function of a hull shader. --- libs/vkd3d-shader/ir.c | 84 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 62 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 974cfb91..b0bd99f9 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -3342,20 +3342,13 @@ static void vsir_cfg_dump_structured_program(struct vsir_cfg *cfg) } static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program, - struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target) + struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target, + size_t *pos) { struct vsir_block *current_block = NULL; enum vkd3d_result ret; size_t i; - if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) - { - FIXME("Hull shaders are not supported.\n"); - vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, - "The structurizer does not support hull shaders."); - return VKD3D_ERROR_INVALID_SHADER; - } - memset(cfg, 0, sizeof(*cfg)); cfg->message_context = message_context; cfg->program = program; @@ -3370,9 +3363,10 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program if (TRACE_ON()) vkd3d_string_buffer_init(&cfg->debug_buffer); - for (i = 0; i < program->instructions.count; ++i) + for (i = *pos; i < program->instructions.count; ++i) { struct vkd3d_shader_instruction *instruction = &program->instructions.elements[i]; + bool finish = false; switch (instruction->handler_idx) { @@ -3404,11 +3398,23 @@ static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program current_block = NULL; break; + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + assert(!current_block); + finish = true; + break; + default: break; } + + if (finish) + break; } + *pos = i; + for (i = 0; i < cfg->block_count; ++i) { struct vsir_block *block = &cfg->blocks[i]; @@ -4881,12 +4887,13 @@ static enum vkd3d_result vsir_cfg_emit_structured_program(struct vsir_cfg *cfg) } static enum vkd3d_result vsir_program_structurize_function(struct vsir_program *program, - struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target) + struct vkd3d_shader_message_context *message_context, struct vsir_cfg_emit_target *target, + size_t *pos) { enum vkd3d_result ret; struct vsir_cfg cfg; - if ((ret = vsir_cfg_init(&cfg, program, message_context, target)) < 0) + if ((ret = vsir_cfg_init(&cfg, program, message_context, target, pos)) < 0) return ret; vsir_cfg_compute_dominators(&cfg); @@ -4919,7 +4926,7 @@ static enum vkd3d_result vsir_program_structurize(struct vsir_program *program, { struct vsir_cfg_emit_target target = {0}; enum vkd3d_result ret; - unsigned int i; + size_t i; target.jump_target_temp_idx = program->temp_count; target.temp_count = program->temp_count + 1; @@ -4927,19 +4934,41 @@ static enum vkd3d_result vsir_program_structurize(struct vsir_program *program, if (!reserve_instructions(&target.instructions, &target.ins_capacity, program->instructions.count)) return VKD3D_ERROR_OUT_OF_MEMORY; - /* Copy declarations until the first block. */ - for (i = 0; i < program->instructions.count; ++i) + for (i = 0; i < program->instructions.count;) { struct vkd3d_shader_instruction *ins = &program->instructions.elements[i]; - if (ins->handler_idx == VKD3DSIH_LABEL) - break; + switch (ins->handler_idx) + { + case VKD3DSIH_LABEL: + assert(program->shader_version.type != VKD3D_SHADER_TYPE_HULL); + TRACE("Structurizing a non-hull shader.\n"); + if ((ret = vsir_program_structurize_function(program, message_context, + &target, &i)) < 0) + goto fail; + assert(i == program->instructions.count); + break; - target.instructions[target.ins_count++] = *ins; - } + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + assert(program->shader_version.type == VKD3D_SHADER_TYPE_HULL); + TRACE("Structurizing phase %u of a hull shader.\n", ins->handler_idx); + target.instructions[target.ins_count++] = *ins; + ++i; + if ((ret = vsir_program_structurize_function(program, message_context, + &target, &i)) < 0) + goto fail; + break; - if ((ret = vsir_program_structurize_function(program, message_context, &target)) < 0) - goto fail; + default: + if (!reserve_instructions(&target.instructions, &target.ins_capacity, target.ins_count + 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + target.instructions[target.ins_count++] = *ins; + ++i; + break; + } + } vkd3d_free(program->instructions.elements); program->instructions.elements = target.instructions; @@ -5058,10 +5087,21 @@ static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(stru { enum vkd3d_result ret; struct vsir_cfg cfg; + size_t stop_pos = 0; + + if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) + { + FIXME("Hull shaders are not supported.\n"); + vkd3d_shader_error(message_context, NULL, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "The structurizer does not support hull shaders."); + return VKD3D_ERROR_INVALID_SHADER; + } - if ((ret = vsir_cfg_init(&cfg, program, message_context, NULL)) < 0) + if ((ret = vsir_cfg_init(&cfg, program, message_context, NULL, &stop_pos)) < 0) return ret; + assert(stop_pos == program->instructions.count); + vsir_cfg_compute_dominators(&cfg); ret = vsir_cfg_materialize_undominated_ssas_to_temps(&cfg);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_TECHNIQUE into a separate class.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: 76971d811ea58677e1d0fa0d679c6e5b0758570e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76971d811ea58677e1d0fa0d679c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 17:15:48 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_TECHNIQUE into a separate class. --- libs/vkd3d-shader/d3dbc.c | 2 ++ libs/vkd3d-shader/fx.c | 4 +++- libs/vkd3d-shader/hlsl.c | 16 ++++++++++------ libs/vkd3d-shader/hlsl.h | 4 +--- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 4ce15b13..6299239b 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1519,6 +1519,7 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) return D3DXPC_OBJECT; case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_UAV: case HLSL_CLASS_VOID: break; @@ -1618,6 +1619,7 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_UAV: case HLSL_CLASS_VOID: break; diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 78d827d7..73160b63 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -222,7 +222,7 @@ static bool technique_matches_version(const struct hlsl_ir_var *var, const struc { const struct hlsl_type *type = var->data_type; - if (type->base_type != HLSL_TYPE_TECHNIQUE) + if (type->class != HLSL_CLASS_TECHNIQUE) return false; return type->e.version >= fx->min_technique_version && type->e.version <= fx->max_technique_version; @@ -439,6 +439,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_ARRAY: case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: vkd3d_unreachable(); case HLSL_CLASS_SAMPLER: @@ -839,6 +840,7 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: /* This cannot appear as an extern variable. */ break; } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a355f210..b5bb72a9 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -367,6 +367,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type case HLSL_CLASS_OBJECT: case HLSL_CLASS_PASS: case HLSL_CLASS_STRING: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: break; } @@ -443,6 +444,7 @@ static bool type_is_single_component(const struct hlsl_type *type) case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: break; } @@ -575,6 +577,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: vkd3d_unreachable(); } @@ -949,6 +952,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: break; } @@ -1005,9 +1009,9 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 if (t1->class == HLSL_CLASS_ARRAY) return t1->e.array.elements_count == t2->e.array.elements_count && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); - if (t1->class == HLSL_CLASS_OBJECT) + if (t1->class == HLSL_CLASS_TECHNIQUE) { - if (t1->base_type == HLSL_TYPE_TECHNIQUE && t1->e.version != t2->e.version) + if (t1->e.version != t2->e.version) return false; } @@ -1097,9 +1101,8 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, type->e.resource.format = old->e.resource.format; break; - case HLSL_CLASS_OBJECT: - if (type->base_type == HLSL_TYPE_TECHNIQUE) - type->e.version = old->e.version; + case HLSL_CLASS_TECHNIQUE: + type->e.version = old->e.version; break; default: @@ -2368,6 +2371,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_PASS: case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: break; } @@ -3672,7 +3676,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (i = 0; i < ARRAY_SIZE(technique_types); ++i) { - type = hlsl_new_type(ctx, technique_types[i].name, HLSL_CLASS_OBJECT, HLSL_TYPE_TECHNIQUE, 1, 1); + type = hlsl_new_simple_type(ctx, technique_types[i].name, HLSL_CLASS_TECHNIQUE); type->e.version = technique_types[i].version; hlsl_scope_add_type(ctx->globals, type); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4f7adf62..a9e47c6f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -83,6 +83,7 @@ enum hlsl_type_class HLSL_CLASS_PASS, HLSL_CLASS_SAMPLER, HLSL_CLASS_STRING, + HLSL_CLASS_TECHNIQUE, HLSL_CLASS_TEXTURE, HLSL_CLASS_UAV, HLSL_CLASS_VOID, @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_RENDERTARGETVIEW, HLSL_TYPE_DEPTHSTENCILVIEW, - HLSL_TYPE_TECHNIQUE, }; enum hlsl_sampler_dim @@ -145,8 +145,6 @@ struct hlsl_type enum hlsl_type_class class; /* If class is <= HLSL_CLASS_LAST_NUMERIC, then base_type is <= HLSL_TYPE_LAST_SCALAR. * If class is HLSL_CLASS_OBJECT, then base_type is > HLSL_TYPE_LAST_SCALAR. - * If class is HLSL_CLASS_OBJECT and base_type is HLSL_TYPE_TECHNIQUE, additional version - * field is used to distinguish between technique types. * Otherwise, base_type is not used. */ enum hlsl_base_type base_type; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9afabcf5..5681761c 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1641,6 +1641,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: case HLSL_CLASS_STRING: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: vkd3d_unreachable(); } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index b933c246..52e6eac8 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3012,6 +3012,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_PASS: case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: + case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: case HLSL_CLASS_VOID:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_PASS into a separate class.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: 3c8c7426dfd533010808f3e812c2ce27d6755c4c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3c8c7426dfd533010808f3e812c2c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 17:08:01 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_PASS into a separate class. --- libs/vkd3d-shader/d3dbc.c | 2 ++ libs/vkd3d-shader/fx.c | 2 ++ 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, 13 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 971db6b3..4ce15b13 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1518,6 +1518,7 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) case HLSL_CLASS_TEXTURE: return D3DXPC_OBJECT; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: case HLSL_CLASS_UAV: case HLSL_CLASS_VOID: break; @@ -1616,6 +1617,7 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) return D3DXPT_STRING; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: case HLSL_CLASS_UAV: case HLSL_CLASS_VOID: break; diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index d2218a50..78d827d7 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -438,6 +438,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_ARRAY: case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: vkd3d_unreachable(); case HLSL_CLASS_SAMPLER: @@ -837,6 +838,7 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type return false; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: /* This cannot appear as an extern variable. */ break; } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index a835c185..a355f210 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -365,6 +365,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_PASS: case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: break; @@ -441,6 +442,7 @@ static bool type_is_single_component(const struct hlsl_type *type) return false; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: case HLSL_CLASS_VOID: break; } @@ -572,6 +574,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty break; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: case HLSL_CLASS_VOID: vkd3d_unreachable(); } @@ -945,6 +948,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) return 1; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: case HLSL_CLASS_VOID: break; } @@ -2361,6 +2365,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_PASS: case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: case HLSL_CLASS_VOID: @@ -3538,7 +3543,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"dword", HLSL_CLASS_SCALAR, HLSL_TYPE_UINT, 1, 1}, {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, - {"pass", HLSL_CLASS_OBJECT, HLSL_TYPE_PASS, 1, 1}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, {"RenderTargetView",HLSL_CLASS_OBJECT, HLSL_TYPE_RENDERTARGETVIEW, 1, 1}, @@ -3655,6 +3659,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, "fxgroup", HLSL_CLASS_EFFECT_GROUP)); + hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "pass", HLSL_CLASS_PASS)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "texture", HLSL_CLASS_TEXTURE)); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e38963ae..4f7adf62 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -80,6 +80,7 @@ enum hlsl_type_class HLSL_CLASS_ARRAY, HLSL_CLASS_OBJECT, HLSL_CLASS_EFFECT_GROUP, + HLSL_CLASS_PASS, HLSL_CLASS_SAMPLER, HLSL_CLASS_STRING, HLSL_CLASS_TEXTURE, @@ -98,7 +99,6 @@ enum hlsl_base_type HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, - HLSL_TYPE_PASS, HLSL_TYPE_RENDERTARGETVIEW, HLSL_TYPE_DEPTHSTENCILVIEW, HLSL_TYPE_TECHNIQUE, diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index cba58080..9afabcf5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1639,6 +1639,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, return false; case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: 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 9bc4e488..b933c246 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3009,6 +3009,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_STRUCT: case HLSL_CLASS_OBJECT: + case HLSL_CLASS_PASS: case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE:

1 0

Giovanni Mascellani : vkd3d-shader/ir: Skip invalid blocks when materializing undominated SSAs.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: d8e4b19cdcd7917d82a70fc2f1cb31166fa52742 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d8e4b19cdcd7917d82a70fc2f1cb3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 19 13:13:15 2024 +0200 vkd3d-shader/ir: Skip invalid blocks when materializing undominated SSAs. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1f8d60c6..974cfb91 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -5001,6 +5001,9 @@ static enum vkd3d_result vsir_cfg_materialize_undominated_ssas_to_temps(struct v struct vsir_block *block = &cfg->blocks[i]; struct vkd3d_shader_instruction *ins; + if (block->label == 0) + continue; + for (ins = block->begin; ins <= block->end; ++ins) { for (j = 0; j < ins->dst_count; ++j) @@ -5016,6 +5019,9 @@ static enum vkd3d_result vsir_cfg_materialize_undominated_ssas_to_temps(struct v struct vsir_block *block = &cfg->blocks[i]; struct vkd3d_shader_instruction *ins; + if (block->label == 0) + continue; + for (ins = block->begin; ins <= block->end; ++ins) { for (j = 0; j < ins->src_count; ++j)

1 0

Conor McCarthy : tests/hlsl: Add tests for texture UAV signed atomics.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: eae1411cdc074cfbe565526de0419ffade99133b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eae1411cdc074cfbe565526de0419… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Mar 4 15:51:10 2024 +1000 tests/hlsl: Add tests for texture UAV signed atomics. --- tests/hlsl/uav-atomics.shader_test | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test index 8235affb..1a025d45 100644 --- a/tests/hlsl/uav-atomics.shader_test +++ b/tests/hlsl/uav-atomics.shader_test @@ -121,3 +121,27 @@ probe uav 1 (5) rui (3) probe uav 1 (6) rui (4) probe uav 1 (7) rui (3) probe uav 1 (8) rui (1) + + +[compute shader todo] +RWTexture2D<int> u : register(u2); + +uniform int4 i; + + [numthreads(3, 1, 1)] +void main() +{ + InterlockedMax(u[uint2(0, 0)], i.x); + InterlockedMin(u[uint2(1, 0)], i.y); +} + +[test] +uniform 0 int4 1 -3 0 0 +todo(sm<6) dispatch 1 1 1 +probe uav 2 (0) ri (1) +probe uav 2 (1) ri (-3) + +uniform 0 int4 -3 1 0 0 +todo(sm<6) dispatch 1 1 1 +probe uav 2 (0) ri (1) +probe uav 2 (1) ri (-3)

1 0

Conor McCarthy : tests/hlsl: Add a test for a structured UAV scalar store.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: 7e4fee658bac4eeee3c7a9f0416c7530b91a9d11 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e4fee658bac4eeee3c7a9f0416c7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Mar 4 15:22:24 2024 +1000 tests/hlsl: Add a test for a structured UAV scalar store. --- tests/hlsl/uav-rwstructuredbuffer.shader_test | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/hlsl/uav-rwstructuredbuffer.shader_test b/tests/hlsl/uav-rwstructuredbuffer.shader_test index 15026d06..bcc96970 100644 --- a/tests/hlsl/uav-rwstructuredbuffer.shader_test +++ b/tests/hlsl/uav-rwstructuredbuffer.shader_test @@ -156,3 +156,25 @@ float4 main() : sv_target1 todo(sm<6) draw quad probe uav 2 (0) rgbai (11, -12, 13, -14) probe uav 2 (1) rgbai (-15, 16, -17, 18) + +[uav 2] +stride 4 +size (buffer, 2) + +1 2 + +% Test scalar store +[pixel shader todo] +RWStructuredBuffer<uint> u : register(u2); + +float4 main() : sv_target1 +{ + u[0] = 11; + u[1] = 12; + return 0; +} + +[test] +todo(sm<6) draw quad +probe uav 2 (0) ri (11) +probe uav 2 (1) ri (12)

1 0

Conor McCarthy : tests/hlsl: Add a test for UAV InterlockedExchange().
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: 1c73ac668fd33880b42d7e97c98fc8bcb819c9a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c73ac668fd33880b42d7e97c98fc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Mar 4 15:23:27 2024 +1000 tests/hlsl: Add a test for UAV InterlockedExchange(). --- tests/hlsl/uav-atomics.shader_test | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test index 549877ec..1acb1add 100644 --- a/tests/hlsl/uav-atomics.shader_test +++ b/tests/hlsl/uav-atomics.shader_test @@ -3,9 +3,9 @@ shader model >= 5.0 [uav 1] format r32 uint -size (buffer, 7) +size (buffer, 9) -0xd 5 6 0x10 4 4 7 +0xd 5 6 0x10 4 4 7 2 0 [compute shader todo] RWBuffer<uint> u : register(u1); @@ -15,6 +15,7 @@ uniform uint4 v; [numthreads(3, 1, 1)] void main() { + uint old; InterlockedAnd(u[0], v.x); InterlockedCompareStore(u[1], v.y, v.x); InterlockedAdd(u[2], v.x); @@ -22,6 +23,8 @@ void main() InterlockedMax(u[4], v.x); InterlockedMin(u[5], v.x); InterlockedXor(u[6], v.x); + InterlockedExchange(u[7], v.x, old); + InterlockedAdd(u[8], old == 2); } [test] @@ -34,6 +37,8 @@ probe uav 1 (3) rui (0x13) probe uav 1 (4) rui (4) probe uav 1 (5) rui (3) probe uav 1 (6) rui (4) +probe uav 1 (7) rui (3) +probe uav 1 (8) rui (1) uniform 0 uint4 1 2 0 0 todo(sm<6) dispatch 2 1 1 @@ -44,6 +49,8 @@ probe uav 1 (3) rui (0x13) probe uav 1 (4) rui (4) probe uav 1 (5) rui (1) probe uav 1 (6) rui (4) +probe uav 1 (7) rui (1) +probe uav 1 (8) rui (1) [uav 2]

1 0

Conor McCarthy : tests/hlsl: Add tests for texture UAV atomics.
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: ee8ca0e9c20ebfda6625521ee74c919aae5bcecc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ee8ca0e9c20ebfda6625521ee74c9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Mar 4 15:24:41 2024 +1000 tests/hlsl: Add tests for texture UAV atomics. --- tests/hlsl/uav-atomics.shader_test | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/hlsl/uav-atomics.shader_test b/tests/hlsl/uav-atomics.shader_test index 1acb1add..8235affb 100644 --- a/tests/hlsl/uav-atomics.shader_test +++ b/tests/hlsl/uav-atomics.shader_test @@ -81,3 +81,43 @@ uniform 0 int4 -3 1 0 0 todo(sm<6) dispatch 1 1 1 probe uav 2 (0) ri (1) probe uav 2 (1) ri (-3) + + +[uav 1] +format r32 uint +size (2d, 9, 1) + +0xd 5 6 0x10 4 4 7 2 0 + +[compute shader todo] +RWTexture2D<uint> u : register(u1); + +uniform uint4 v; + + [numthreads(3, 1, 1)] +void main() +{ + uint old; + InterlockedAnd(u[uint2(0, 0)], v.x); + InterlockedCompareStore(u[uint2(1, 0)], v.y, v.x); + InterlockedAdd(u[uint2(2, 0)], v.x); + InterlockedOr(u[uint2(3, 0)], v.x); + InterlockedMax(u[uint2(4, 0)], v.x); + InterlockedMin(u[uint2(5, 0)], v.x); + InterlockedXor(u[uint2(6, 0)], v.x); + InterlockedExchange(u[uint2(7, 0)], v.x, old); + InterlockedAdd(u[uint2(8, 0)], old == 2); +} + +[test] +uniform 0 uint4 3 5 0 0 +todo(sm<6) dispatch 1 1 1 +probe uav 1 (0) rui (1) +probe uav 1 (1) rui (3) +probe uav 1 (2) rui (15) +probe uav 1 (3) rui (0x13) +probe uav 1 (4) rui (4) +probe uav 1 (5) rui (3) +probe uav 1 (6) rui (4) +probe uav 1 (7) rui (3) +probe uav 1 (8) rui (1)

1 0

Conor McCarthy : tests/hlsl: Add tests for min() and integer max().
by Alexandre Julliard April 23, 2024

April 23, 2024

Module: vkd3d Branch: master Commit: 0f7095d2aabb781df3b21a68e92501f214006126 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f7095d2aabb781df3b21a68e9250… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Mar 4 15:21:18 2024 +1000 tests/hlsl: Add tests for min() and integer max(). --- Makefile.am | 2 +- tests/hlsl/max-min.shader_test | 115 +++++++++++++++++++++++++++++++++++++++++ tests/hlsl/max.shader_test | 54 ------------------- 3 files changed, 116 insertions(+), 55 deletions(-) diff --git a/Makefile.am b/Makefile.am index 564b9644..432f4f27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,7 @@ vkd3d_shader_tests = \ tests/hlsl/math.shader_test \ tests/hlsl/matrix-indexing.shader_test \ tests/hlsl/matrix-semantics.shader_test \ - tests/hlsl/max.shader_test \ + tests/hlsl/max-min.shader_test \ tests/hlsl/minimum-precision.shader_test \ tests/hlsl/mul.shader_test \ tests/hlsl/multiple-rt.shader_test \ diff --git a/tests/hlsl/max-min.shader_test b/tests/hlsl/max-min.shader_test new file mode 100644 index 00000000..fd228a54 --- /dev/null +++ b/tests/hlsl/max-min.shader_test @@ -0,0 +1,115 @@ +[pixel shader] +uniform float2 u; + +float4 main() : sv_target +{ + return float4(max(u.x, u.y), max(2, 2.1), max(true, 2), max(-1, -1)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.0 0.0 +todo(glsl) draw quad +probe all rgba (0.7, 2.1, 2.0, -1.0) + + +[pixel shader] +uniform float4 u; + +float4 main() : sv_target +{ + float3 a = float3(-0.1, 0.2, 0.3); + + return float4(max(u.xy, u.zw), max(a, u.xy)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.4 0.8 +todo(glsl) draw quad +probe all rgba (0.7, 0.8, 0.7, 0.2) + + +[pixel shader] +float4 main() : sv_target +{ + float2x3 a = {1, 2, 3, 4, 5, 6}; + float3x2 b = {6, 5, 4, 3, 2, 1}; + + float2x2 r = max(a, b); + return float4(r); +} + +[test] +todo(glsl) draw quad +probe all rgba (6.0, 5.0, 4.0, 5.0) + + +[pixel shader fail] +float4 main() : sv_target +{ + float2x2 a = {1, 2, 3, 4}; + float4 b = {4, 3, 2, 1}; + + max(a, b); + return 0; +} + + +[pixel shader] +uniform float2 u; + +float4 main() : sv_target +{ + return float4(min(u.x, u.y), min(2, 2.1), min(true, 2), min(-1, -2)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.0 0.0 +todo(glsl) draw quad +probe all rgba (-0.1, 2.0, 1.0, -2.0) + + +[pixel shader] +uniform float4 u; + +float4 main() : sv_target +{ + float3 a = float3(-0.2, 0.2, 0.3); + + return float4(min(u.xy, u.zw), min(a, u.xy)); +} + +[test] +uniform 0 float4 0.7 -0.1 0.4 0.8 +todo(glsl) draw quad +probe all rgba (0.4, -0.1, -0.2, -0.1) + + +[require] +shader model >= 4.0 + +[pixel shader] +uniform uint2 u; + +uint4 main() : sv_target +{ + return uint4(max(u.x, u.y), min(true, u.y), max(1, 2), min(1, 2)); +} + +[test] +uniform 0 uint4 1 2 0 0 +todo(glsl) draw quad +probe all rgbaui (2, 1, 2, 1) + + +[pixel shader todo] +uniform int2 u; + +int4 main() : sv_target +{ + return int4(max(u.x, u.y), min(u.x, u.y), max(-true, -2), min(-1, -2)); +} + +[test] +uniform 0 int4 -1 -2 0 0 +todo(sm<6) draw quad +probe all rgbai (-1, -2, -1, -2) diff --git a/tests/hlsl/max.shader_test b/tests/hlsl/max.shader_test deleted file mode 100644 index 67aa6904..00000000 --- a/tests/hlsl/max.shader_test +++ /dev/null @@ -1,54 +0,0 @@ -[pixel shader] -uniform float2 u; - -float4 main() : sv_target -{ - return float4(max(u.x, u.y), max(2, 2.1), max(true, 2), max(-1, -1)); -} - -[test] -uniform 0 float4 0.7 -0.1 0.0 0.0 -todo(glsl) draw quad -probe all rgba (0.7, 2.1, 2.0, -1.0) - - -[pixel shader] -uniform float4 u; - -float4 main() : sv_target -{ - float3 a = float3(-0.1, 0.2, 0.3); - - return float4(max(u.xy, u.zw), max(a, u.xy)); -} - -[test] -uniform 0 float4 0.7 -0.1 0.4 0.8 -todo(glsl) draw quad -probe all rgba (0.7, 0.8, 0.7, 0.2) - - -[pixel shader] -float4 main() : sv_target -{ - float2x3 a = {1, 2, 3, 4, 5, 6}; - float3x2 b = {6, 5, 4, 3, 2, 1}; - - float2x2 r = max(a, b); - return float4(r); -} - -[test] -todo(glsl) draw quad -probe all rgba (6.0, 5.0, 4.0, 5.0) - - -[pixel shader fail] -float4 main() : sv_target -{ - float2x2 a = {1, 2, 3, 4}; - float4 b = {4, 3, 2, 1}; - - max(a, b); - return 0; -}

1 0