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

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics LoadOutputControlPoint and LoadPatchConstant.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 34799629834e20e890435e3e13d554932749107e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/34799629834e20e890435e3e13d55… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:47:37 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsics LoadOutputControlPoint and LoadPatchConstant. --- libs/vkd3d-shader/dxil.c | 47 +++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0e3ce50c..3e3a320b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -419,6 +419,8 @@ enum dx_intrinsic_opcode DX_FLATTENED_THREAD_ID_IN_GROUP = 96, DX_MAKE_DOUBLE = 101, DX_SPLIT_DOUBLE = 102, + DX_LOAD_OUTPUT_CONTROL_POINT = 103, + DX_LOAD_PATCH_CONSTANT = 104, DX_PRIMITIVE_ID = 108, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -2434,10 +2436,12 @@ static void register_index_address_init(struct vkd3d_shader_register_index *idx, if (sm6_value_is_constant(address)) { idx->offset = sm6_value_get_constant_uint(address); + idx->rel_addr = NULL; } else if (sm6_value_is_undef(address)) { idx->offset = 0; + idx->rel_addr = NULL; } else { @@ -5032,18 +5036,43 @@ static void sm6_parser_emit_dx_tertiary(struct sm6_parser *sm6, enum dx_intrinsi static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { + bool is_control_point = op == DX_LOAD_OUTPUT_CONTROL_POINT; + bool is_patch_constant = op == DX_LOAD_PATCH_CONSTANT; struct vkd3d_shader_instruction *ins = state->ins; + unsigned int count, row_index, column_index; + const struct vkd3d_shader_dst_param *params; struct vkd3d_shader_src_param *src_param; const struct shader_signature *signature; - unsigned int row_index, column_index; const struct signature_element *e; row_index = sm6_value_get_constant_uint(operands[0]); column_index = sm6_value_get_constant_uint(operands[2]); + if (is_control_point && operands[3]->is_undefined) + { + /* dxcompiler will compile source which does this, so let it pass. */ + WARN("Control point id is undefined.\n"); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_UNDEFINED_OPERAND, + "The index for a control point load is undefined."); + } + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - signature = &sm6->p.program.input_signature; + if (is_patch_constant) + { + signature = &sm6->p.program.patch_constant_signature; + params = sm6->patch_constant_params; + } + else if (is_control_point) + { + signature = &sm6->p.program.output_signature; + params = sm6->output_params; + } + else + { + signature = &sm6->p.program.input_signature; + params = sm6->input_params; + } if (row_index >= signature->element_count) { WARN("Invalid row index %u.\n", row_index); @@ -5055,10 +5084,18 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) return; - src_param->reg = sm6->input_params[row_index].reg; + src_param->reg = params[row_index].reg; src_param_init_scalar(src_param, column_index); + count = 0; + if (e->register_count > 1) - register_index_address_init(&src_param->reg.idx[0], operands[1], sm6); + register_index_address_init(&src_param->reg.idx[count++], operands[1], sm6); + + if (!is_patch_constant && !operands[3]->is_undefined) + { + assert(src_param->reg.idx_count > count); + register_index_address_init(&src_param->reg.idx[count], operands[3], sm6); + } instruction_dst_param_init_ssa_scalar(ins, sm6); } @@ -5808,6 +5845,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LEGACY_F16TOF32 ] = {"f", "i", sm6_parser_emit_dx_unary}, [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, + [DX_LOAD_OUTPUT_CONTROL_POINT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, + [DX_LOAD_PATCH_CONSTANT ] = {"o", "ii8", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_MAKE_DOUBLE ] = {"d", "ii", sm6_parser_emit_dx_make_double}, [DX_PRIMITIVE_ID ] = {"i", "", sm6_parser_emit_dx_primitive_id}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 447f4ebb..1b60d96e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -202,6 +202,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_INVALID_MASK = 8307, VKD3D_SHADER_WARNING_DXIL_INVALID_OPERATION = 8308, VKD3D_SHADER_WARNING_DXIL_IGNORING_ATTACHMENT = 8309, + VKD3D_SHADER_WARNING_DXIL_UNDEFINED_OPERAND = 8310, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic DomainLocation.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 3976738bafaf1082f77bccf768d1b4f1df173169 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3976738bafaf1082f77bccf768d1b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:52:42 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic DomainLocation. --- libs/vkd3d-shader/dxil.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 25020f11..7d59708c 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -421,6 +421,7 @@ enum dx_intrinsic_opcode DX_SPLIT_DOUBLE = 102, DX_LOAD_OUTPUT_CONTROL_POINT = 103, DX_LOAD_PATCH_CONSTANT = 104, + DX_DOMAIN_LOCATION = 105, DX_STORE_PATCH_CONSTANT = 106, DX_PRIMITIVE_ID = 108, DX_LEGACY_F32TOF16 = 130, @@ -4800,6 +4801,33 @@ static void sm6_parser_emit_dx_discard(struct sm6_parser *sm6, enum dx_intrinsic src_param_init_from_value(src_param, operands[0]); } +static void sm6_parser_emit_dx_domain_location(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + unsigned int component_idx; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + + if ((component_idx = sm6_value_get_constant_uint(operands[0])) >= 3) + { + WARN("Invalid component index %u.\n", component_idx); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid domain location component index %u.", component_idx); + component_idx = 0; + } + + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + sm6_parser_dcl_register_builtin(sm6, VKD3DSIH_DCL_INPUT, VKD3DSPR_TESSCOORD, VKD3D_DATA_FLOAT, 3); + vsir_register_init(&src_param->reg, VKD3DSPR_TESSCOORD, VKD3D_DATA_FLOAT, 0); + src_param->reg.dimension = VSIR_DIMENSION_VEC4; + src_param_init_scalar(src_param, component_idx); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_dot(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5818,6 +5846,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_DERIV_FINEX ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_FINEY ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DISCARD ] = {"v", "1", sm6_parser_emit_dx_discard}, + [DX_DOMAIN_LOCATION ] = {"f", "c", sm6_parser_emit_dx_domain_location}, [DX_DOT2 ] = {"g", "RRRR", sm6_parser_emit_dx_dot}, [DX_DOT3 ] = {"g", "RRRRRR", sm6_parser_emit_dx_dot}, [DX_DOT4 ] = {"g", "RRRRRRRR", sm6_parser_emit_dx_dot},

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic StorePatchConstant.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: e165f9cefc79ae654960919b0376cd0622733bc3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e165f9cefc79ae654960919b0376c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:50:09 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic StorePatchConstant. --- libs/vkd3d-shader/dxil.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 3e3a320b..25020f11 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -421,6 +421,7 @@ enum dx_intrinsic_opcode DX_SPLIT_DOUBLE = 102, DX_LOAD_OUTPUT_CONTROL_POINT = 103, DX_LOAD_PATCH_CONSTANT = 104, + DX_STORE_PATCH_CONSTANT = 106, DX_PRIMITIVE_ID = 108, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -5553,6 +5554,7 @@ static void sm6_parser_emit_dx_split_double(struct sm6_parser *sm6, enum dx_intr static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { + bool is_patch_constant = op == DX_STORE_PATCH_CONSTANT; struct vkd3d_shader_instruction *ins = state->ins; struct vkd3d_shader_src_param *src_param; struct vkd3d_shader_dst_param *dst_param; @@ -5564,7 +5566,7 @@ static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intr row_index = sm6_value_get_constant_uint(operands[0]); column_index = sm6_value_get_constant_uint(operands[2]); - signature = &sm6->p.program.output_signature; + signature = is_patch_constant ? &sm6->p.program.patch_constant_signature : &sm6->p.program.output_signature; if (row_index >= signature->element_count) { WARN("Invalid row index %u.\n", row_index); @@ -5596,7 +5598,7 @@ static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intr if (!(dst_param = instruction_dst_params_alloc(ins, 1, sm6))) return; dst_param_init_scalar(dst_param, column_index); - dst_param->reg = sm6->output_params[row_index].reg; + dst_param->reg = is_patch_constant ? sm6->patch_constant_params[row_index].reg : sm6->output_params[row_index].reg; if (e->register_count > 1) register_index_address_init(&dst_param->reg.idx[0], operands[1], sm6); @@ -5870,6 +5872,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_SPLIT_DOUBLE ] = {"S", "d", sm6_parser_emit_dx_split_double}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, + [DX_STORE_PATCH_CONSTANT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, [DX_TAN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_TEX2DMS_GET_SAMPLE_POS ] = {"o", "Hi", sm6_parser_emit_dx_get_sample_pos}, [DX_TEXTURE_GATHER ] = {"o", "HHffffiic", sm6_parser_emit_dx_texture_gather},

1 0

Conor McCarthy : vkd3d-shader/dxil: Support patch constant functions and signatures.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 4457181b2a9ffdb889bb33322c9fd60f9b602f80 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4457181b2a9ffdb889bb33322c9fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 14:31:16 2023 +1000 vkd3d-shader/dxil: Support patch constant functions and signatures. --- libs/vkd3d-shader/dxil.c | 114 ++++++++++++++++++++++++++----- libs/vkd3d-shader/ir.c | 14 +++- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++ 3 files changed, 114 insertions(+), 18 deletions(-)

1 0

Conor McCarthy : tests/hlsl: Add wave op tests.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: d5c6e12dd32892aa445e9d47c6622321d50d7182 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5c6e12dd32892aa445e9d47c6622… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 16 14:30:12 2024 +1000 tests/hlsl: Add wave op tests. --- Makefile.am | 2 + tests/hlsl/wave-ops-float.shader_test | 459 ++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-int.shader_test | 55 ++++ tests/hlsl/wave-ops-uint.shader_test | 304 ++++++++++++++++++++++ 4 files changed, 820 insertions(+)

1 0

Zebediah Figura : tests: Add tests for register space reservation syntax.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 6cf065e7fd6588e07535a953817e2f764e947c91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6cf065e7fd6588e07535a953817e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 28 17:27:29 2023 -0500 tests: Add tests for register space reservation syntax. --- Makefile.am | 1 + tests/hlsl/register-reservations-space.shader_test | 139 +++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9ed32316..5c2d4e08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -171,6 +171,7 @@ vkd3d_shader_tests = \ tests/hlsl/register-reservations-numeric.shader_test \ tests/hlsl/register-reservations-profile.shader_test \ tests/hlsl/register-reservations-resources.shader_test \ + tests/hlsl/register-reservations-space.shader_test \ tests/hlsl/return-implicit-conversion.shader_test \ tests/hlsl/return.shader_test \ tests/hlsl/round.shader_test \ diff --git a/tests/hlsl/register-reservations-space.shader_test b/tests/hlsl/register-reservations-space.shader_test new file mode 100644 index 00000000..96ff140a --- /dev/null +++ b/tests/hlsl/register-reservations-space.shader_test @@ -0,0 +1,139 @@ +% Tests for register space reservation syntax. We don't bother testing register +% space here, since it's specific to d3d12 and would require reworking a lot of +% the shader test code. + +[require] +shader model >= 5.1 + +[srv 0] +size (2d, 1, 1) +0.0 0.0 0.0 99.0 + +[srv 1] +size (2d, 1, 1) +1.0 1.0 1.0 99.0 + +[srv 2] +size (2d, 1, 1) +2.0 2.0 2.0 99.0 + +[pixel shader todo] +Texture2D tex1 : register(t1, space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +probe all rgba (1, 1, 1, 99) + + +[pixel shader todo fail(sm>=6)] +Texture2D tex1 : register(t1, sPaCe0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +probe all rgba (1, 1, 1, 99) + + +[pixel shader fail todo] +Texture2D tex1 : register(space0, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader fail(sm<6)] +Texture2D tex1 : register(ps, space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (0, 0, 0, 99) + + +[pixel shader fail(sm<6)] +Texture2D tex1 : register(space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (0, 0, 0, 99) + + +% Specifying a profile is just broken. The first reservation (or, with sm6, the +% last) is taken regardless of whether it actually matches the current profile. + +[pixel shader todo] +Texture2D tex1 : register(vs, t1, space0) : register(ps, t2, space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe all rgba (2, 2, 2, 99) +if(sm<6) probe all rgba (1, 1, 1, 99) + + +% This actually inheres to 5.1+; it doesn't matter whether "space" is specified. + +[pixel shader todo] +Texture2D tex1 : register(vs, t1) : register(ps, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe all rgba (2, 2, 2, 99) +if(sm<6) probe all rgba (1, 1, 1, 99) + + +% It's still illegal to specify multiple contradictory reservations with the +% same profile... + +[pixel shader fail todo] +Texture2D tex1 : register(vs, t1) : register(vs, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +% ...but it's not illegal to specify e.g. ps alongside ps_5_1. + +[pixel shader todo] +Texture2D tex1 : register(ps, t1) : register(ps_5_1, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe all rgba (2, 2, 2, 99) +if(sm<6) probe all rgba (1, 1, 1, 99)

1 0

Zebediah Figura : tests: Add tests for profile syntax in register reservations.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: f7a79517aed8dd882f001a82adbff8f85ac1238d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f7a79517aed8dd882f001a82adbff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 28 17:27:17 2023 -0500 tests: Add tests for profile syntax in register reservations. --- Makefile.am | 1 + .../hlsl/register-reservations-profile.shader_test | 261 +++++++++++++++++++++ 2 files changed, 262 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2c36d703..9ed32316 100644 --- a/Makefile.am +++ b/Makefile.am @@ -169,6 +169,7 @@ vkd3d_shader_tests = \ tests/hlsl/reflect.shader_test \ tests/hlsl/refract.shader_test \ tests/hlsl/register-reservations-numeric.shader_test \ + tests/hlsl/register-reservations-profile.shader_test \ tests/hlsl/register-reservations-resources.shader_test \ tests/hlsl/return-implicit-conversion.shader_test \ tests/hlsl/return.shader_test \ diff --git a/tests/hlsl/register-reservations-profile.shader_test b/tests/hlsl/register-reservations-profile.shader_test new file mode 100644 index 00000000..00ca86e6 --- /dev/null +++ b/tests/hlsl/register-reservations-profile.shader_test @@ -0,0 +1,261 @@ +% Tests for register reservations that use the "profile" syntax. + +[require] +shader model >= 4.0 + +[srv 0] +size (2d, 1, 1) +0.0 0.0 0.0 99.0 + +[srv 1] +size (2d, 1, 1) +1.0 1.0 1.0 99.0 + +[srv 2] +size (2d, 1, 1) +2.0 2.0 2.0 99.0 + +[pixel shader todo] +Texture2D tex1 : register(vs, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +% sm6 seems to ignore profile qualifiers entirely. +if(sm>=6) probe all rgba (1, 1, 1, 99) +if(sm<6) probe all rgba (0, 0, 0, 99) + + +[pixel shader todo] +Texture2D tex1 : register(cs, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe all rgba (1, 1, 1, 99) +if(sm<6) probe all rgba (0, 0, 0, 99) + + +[pixel shader todo] +Texture2D tex1 : register(ps, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +probe all rgba (1, 1, 1, 99) + + +[pixel shader fail todo] +Texture2D tex1 : register(PS, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader fail todo] +Texture2D tex1 : register(qs, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader fail] +Texture2D tex1 : register(ps); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader fail(sm<6) todo] +Texture2D tex1 : register(ps_4, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (1, 1, 1, 99) + + +[pixel shader todo] +Texture2D tex1 : register(ps_4_0, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +probe all rgba (1, 1, 1, 99) + + +[pixel shader fail] +Texture2D tex1 : register(ps.4.0, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader todo] +Texture2D tex1 : register(ps_4_1, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe all rgba (1, 1, 1, 99) +if(sm<6) probe all rgba (0, 0, 0, 99) + + +[pixel shader todo] +Texture2D tex1 : register(ps_4_1, t1) : register(ps_4_0, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +probe all rgba (2, 2, 2, 99) + +% The documentation explicitly gives this case as an example, implying that a +% more specific profile takes precedence over a less specific one. It doesn't. +% If we're not on the specific version, the compiler silently chooses the +% general case; if we are, the compiler detects a conflict and fails. + +% sm6 is of course different. It seems to detect conflicts if the exact same +% reservation is given, but if two different reservations are given it instead +% just picks the last one, without regard to version. + +[pixel shader todo] +Texture2D tex1 : register(ps, t1) : register(ps_5_0, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe all rgba (2, 2, 2, 99) +if(sm<6) probe all rgba (1, 1, 1, 99) + + +[pixel shader fail(sm<6) todo] +Texture2D tex1 : register(ps, t1) : register(ps_4_0, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (2, 2, 2, 99) + + +[pixel shader fail(sm<6) todo] +Texture2D tex1 : register(ps_4_0, t1) : register(ps, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (2, 2, 2, 99) + + +[pixel shader fail(sm<6) todo] +Texture2D tex1 : register(ps_6_0, t1) : register(ps, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +draw quad +probe all rgba (2, 2, 2, 99) + + +[pixel shader fail todo] +Texture2D tex1 : register(ps_4_0, t1) : register(t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader fail] +Texture2D tex1 : register(t1, ps_4_0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +% It's also illegal to specify contradictory register reservations with the +% *same* profile, even if they aren't the current one. + +[pixel shader fail todo] +Texture2D tex1 : register(vs_4_0, t1) : register(vs_4_0, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +[pixel shader fail todo] +Texture2D tex1 : register(vs, t1) : register(vs, t2); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + + +% Specifying the same reservation twice is fine, though. + +[pixel shader todo] +Texture2D tex1 : register(ps, t1) : register(ps, t1); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +probe all rgba (1, 1, 1, 99)

1 0

Zebediah Figura : tests: Do not run the d3d11 backend with shader model 5.1.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: e3e93b76d233370ee7d0e6d43b23af6fd46934d1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e3e93b76d233370ee7d0e6d43b23a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Apr 15 16:51:32 2024 -0500 tests: Do not run the d3d11 backend with shader model 5.1. --- tests/shader_runner_d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index c656a318..bb1d00d6 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -273,7 +273,7 @@ static BOOL init_test_context(struct d3d11_shader_runner *runner) runner->caps.runner = "d3d11.dll"; runner->caps.minimum_shader_model = SHADER_MODEL_4_0; - runner->caps.maximum_shader_model = SHADER_MODEL_5_1; + runner->caps.maximum_shader_model = SHADER_MODEL_5_0; hr = ID3D11Device_CheckFeatureSupport(runner->device, D3D11_FEATURE_DOUBLES, &doubles, sizeof(doubles));

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse register space reservations.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 833c897aac2ea2eb006be6aa206058d991976cde URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/833c897aac2ea2eb006be6aa20605… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 16 21:01:51 2021 -0500 vkd3d-shader/hlsl: Parse register space reservations. --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 60 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index aff3c59f..ba8b09d2 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -392,7 +392,7 @@ struct hlsl_attribute struct hlsl_reg_reservation { char reg_type; - unsigned int reg_index; + unsigned int reg_space, reg_index; char offset_type; unsigned int offset_index; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea108a52..f99f322d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1197,17 +1197,18 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl return true; } -static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) +static bool parse_reservation_index(const char *string, char *type, uint32_t *index) { - struct hlsl_reg_reservation reservation = {0}; + if (!sscanf(string + 1, "%u", index)) + return false; - if (!sscanf(reg_string + 1, "%u", &reservation.reg_index)) - { - FIXME("Unsupported register reservation syntax.\n"); - return reservation; - } - reservation.reg_type = ascii_tolower(reg_string[0]); - return reservation; + *type = ascii_tolower(string[0]); + return true; +} + +static bool parse_reservation_space(const char *string, uint32_t *space) +{ + return !ascii_strncasecmp(string, "space", 5) && sscanf(string + 5, "%u", space); } static struct hlsl_reg_reservation parse_packoffset(struct hlsl_ctx *ctx, const char *reg_string, @@ -6330,16 +6331,51 @@ semantic: register_reservation: ':' KW_REGISTER '(' any_identifier ')' { - $$ = parse_reg_reservation($4); + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index)) + hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $4); + vkd3d_free($4); } | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' { - FIXME("Ignoring shader target %s in a register reservation.\n", debugstr_a($4)); + memset(&$$, 0, sizeof($$)); + if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index)) + { + hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); + } + else if (parse_reservation_space($6, &$$.reg_space)) + { + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index)) + hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $4); + } + else + { + hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register or space reservation '%s'.", $6); + } + vkd3d_free($4); + vkd3d_free($6); + } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier ',' any_identifier ')' + { + hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); - $$ = parse_reg_reservation($6); + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index)) + hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $6); + + if (!parse_reservation_space($8, &$$.reg_space)) + hlsl_error(ctx, &@8, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register space reservation '%s'.", $8); + + vkd3d_free($4); vkd3d_free($6); + vkd3d_free($8); } packoffset_reservation:

1 0

Zebediah Figura : vkd3d-shader/hlsl: Rename register_opt and packoffset_opt to register_reservation and packoffset_reservation.
by Alexandre Julliard April 22, 2024

April 22, 2024

Module: vkd3d Branch: master Commit: 29f6a7e5f7cde79fa25ccc4507b43f71aaebd54b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/29f6a7e5f7cde79fa25ccc4507b43… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 28 17:21:34 2023 -0500 vkd3d-shader/hlsl: Rename register_opt and packoffset_opt to register_reservation and packoffset_reservation. "opt" seems to imply "optional", but the optional aspect of these reservations is not (and never has been) encoded into these rules. --- libs/vkd3d-shader/hlsl.y | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0c196b77..ea108a52 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5675,8 +5675,8 @@ static bool state_block_add_entry(struct hlsl_state_block *state_block, struct h %type <parameters> param_list %type <parameters> parameters -%type <reg_reservation> register_opt -%type <reg_reservation> packoffset_opt +%type <reg_reservation> register_reservation +%type <reg_reservation> packoffset_reservation %type <sampler_dim> texture_type texture_ms_type uav_type rov_type @@ -6300,12 +6300,12 @@ colon_attribute: $$.reg_reservation.reg_type = 0; $$.reg_reservation.offset_type = 0; } - | register_opt + | register_reservation { $$.semantic = (struct hlsl_semantic){0}; $$.reg_reservation = $1; } - | packoffset_opt + | packoffset_reservation { $$.semantic = (struct hlsl_semantic){0}; $$.reg_reservation = $1; @@ -6327,7 +6327,7 @@ semantic: } /* FIXME: Writemasks */ -register_opt: +register_reservation: ':' KW_REGISTER '(' any_identifier ')' { $$ = parse_reg_reservation($4); @@ -6342,7 +6342,7 @@ register_opt: vkd3d_free($6); } -packoffset_opt: +packoffset_reservation: ':' KW_PACKOFFSET '(' any_identifier ')' { $$ = parse_packoffset(ctx, $4, NULL, &@$);

1 0