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

Nikolay Sivov : vkd3d-shader/fx: Add support for writing RasterizerState objects.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: 94130c23943fd9382900a3730bc7212021cf9e18 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/94130c23943fd9382900a3730bc72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 10 13:18:43 2024 +0200 vkd3d-shader/fx: Add support for writing RasterizerState objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 558cf04d..ace7c049 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -95,6 +95,7 @@ struct fx_write_context uint32_t uav_count; uint32_t sampler_state_count; uint32_t depth_stencil_state_count; + uint32_t rasterizer_state_count; int status; bool child_effect; @@ -563,6 +564,10 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co { put_u32_unaligned(buffer, 6); } + else if (type->class == HLSL_CLASS_RASTERIZER_STATE) + { + put_u32_unaligned(buffer, 4); + } else if (type->class == HLSL_CLASS_DEPTH_STENCIL_STATE) { put_u32_unaligned(buffer, 3); @@ -1295,6 +1300,21 @@ static void resolve_fx_4_state_block_values(struct hlsl_ir_var *var, struct hlsl { NULL } }; + static const struct rhs_named_value fill_values[] = + { + { "WIREFRAME", 2 }, + { "SOLID", 3 }, + { NULL } + }; + + static const struct rhs_named_value cull_values[] = + { + { "NONE", 1 }, + { "FRONT", 2 }, + { "BACK", 3 }, + { NULL } + }; + static const struct state { const char *name; @@ -1307,6 +1327,17 @@ static void resolve_fx_4_state_block_values(struct hlsl_ir_var *var, struct hlsl } states[] = { + { "FillMode", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_UINT, 1, 12, fill_values }, + { "CullMode", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_UINT, 1, 13, cull_values }, + { "FrontCounterClockwise", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_BOOL, 1, 14 }, + { "DepthBias", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_UINT, 1, 15 }, + { "DepthBiasClamp", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_FLOAT, 1, 16 }, + { "SlopeScaledDepthBias", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_FLOAT, 1, 17 }, + { "DepthClipEnable", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_BOOL, 1, 18 }, + { "ScissorEnable", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_BOOL, 1, 19 }, + { "MultisampleEnable", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_BOOL, 1, 20 }, + { "AntializedLineEnable", HLSL_CLASS_RASTERIZER_STATE, HLSL_CLASS_SCALAR, FX_BOOL, 1, 21 }, + { "DepthEnable", HLSL_CLASS_DEPTH_STENCIL_STATE, HLSL_CLASS_SCALAR, FX_BOOL, 1, 22 }, { "DepthWriteMask", HLSL_CLASS_DEPTH_STENCIL_STATE, HLSL_CLASS_SCALAR, FX_UINT, 1, 23, depth_write_mask_values }, { "DepthFunc", HLSL_CLASS_DEPTH_STENCIL_STATE, HLSL_CLASS_SCALAR, FX_UINT, 1, 24, comparison_values }, @@ -1521,6 +1552,11 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ fx->sampler_state_count += elements_count; break; + case HLSL_CLASS_RASTERIZER_STATE: + write_fx_4_state_object_initializer(var, fx); + fx->rasterizer_state_count += elements_count; + break; + default: hlsl_fixme(ctx, &ctx->location, "Writing initializer for object type %u is not implemented.", type->e.numeric.type); @@ -1691,7 +1727,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.texture_count); put_u32(&buffer, fx.depth_stencil_state_count); put_u32(&buffer, 0); /* Blend state count. */ - put_u32(&buffer, 0); /* Rasterizer state count. */ + put_u32(&buffer, fx.rasterizer_state_count); put_u32(&buffer, fx.sampler_state_count); put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); @@ -1749,7 +1785,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.texture_count); put_u32(&buffer, fx.depth_stencil_state_count); put_u32(&buffer, 0); /* Blend state count. */ - put_u32(&buffer, 0); /* Rasterizer state count. */ + put_u32(&buffer, fx.rasterizer_state_count); put_u32(&buffer, fx.sampler_state_count); put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count);

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add support for ConstantBuffer<> type.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: 48ff7de8ef0dbdffac9819e936fd8f269b4497ac URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/48ff7de8ef0dbdffac9819e936fd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 00:31:51 2024 +0200 vkd3d-shader/hlsl: Add support for ConstantBuffer<> type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/d3dbc.c | 2 ++ libs/vkd3d-shader/fx.c | 2 ++ libs/vkd3d-shader/hlsl.c | 38 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.l | 4 +++- libs/vkd3d-shader/hlsl.y | 26 +++++++++++++++++++++- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 1 + tests/hlsl/cbuffer.shader_test | 48 +++++++++++++++++++++++++++++++++++----- 9 files changed, 117 insertions(+), 7 deletions(-)

1 0

Victor Chiletto : vkd3d-shader/hlsl: Support expressions as register offsets.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: e13eb64d4c8d2b04f194e832153c3be95a5a3a60 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e13eb64d4c8d2b04f194e832153c3… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Support expressions as register offsets. --- libs/vkd3d-shader/hlsl.y | 94 ++++++++++++++++++++-- .../hlsl/register-reservations-numeric.shader_test | 24 +++--- tests/hlsl/register-reservations-space.shader_test | 4 +- 3 files changed, 101 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9c75c87d..54227041 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1214,12 +1214,23 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl return true; } -static bool parse_reservation_index(const char *string, char *type, uint32_t *index) +static bool parse_reservation_index(const char *string, char *type, uint32_t *index, unsigned int bracket_offset) { - if (!sscanf(string + 1, "%u", index)) - return false; + char *endptr; *type = ascii_tolower(string[0]); + + if (string[1] == '\0') + { + *index = bracket_offset; + return true; + } + + *index = strtoul(string + 1, &endptr, 10) + bracket_offset; + + if (endptr == string + 1) + return false; + return true; } @@ -6545,22 +6556,35 @@ register_reservation: ':' KW_REGISTER '(' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index)) + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, 0)) + hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $4); + + vkd3d_free($4); + } + | ':' KW_REGISTER '(' any_identifier '[' expr ']' ')' + { + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $6, &@6))) + { hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); + } vkd3d_free($4); + vkd3d_free($6); } | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index)) + if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index, 0)) { 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)) + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, 0)) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); } @@ -6573,12 +6597,47 @@ register_reservation: vkd3d_free($4); vkd3d_free($6); } + | ':' KW_REGISTER '(' any_identifier '[' expr ']' ',' any_identifier ')' + { + memset(&$$, 0, sizeof($$)); + + if (!parse_reservation_space($9, &$$.reg_space)) + hlsl_error(ctx, &@9, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register space reservation '%s'.", $9); + + if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $6, &@6))) + { + hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $4); + } + + vkd3d_free($4); + vkd3d_free($6); + vkd3d_free($9); + } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier '[' expr ']' ')' + { + hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); + + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $8, &@8))) + { + hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $6); + } + + vkd3d_free($4); + vkd3d_free($6); + vkd3d_free($8); + } | ':' KW_REGISTER '(' any_identifier ',' any_identifier ',' any_identifier ')' { hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index)) + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, 0)) hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6); @@ -6590,6 +6649,27 @@ register_reservation: vkd3d_free($6); vkd3d_free($8); } + | ':' KW_REGISTER '(' any_identifier ',' any_identifier '[' expr ']' ',' any_identifier ')' + { + hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); + + memset(&$$, 0, sizeof($$)); + if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, + evaluate_static_expression_as_uint(ctx, $8, &@8))) + { + hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register reservation '%s'.", $6); + } + + if (!parse_reservation_space($11, &$$.reg_space)) + hlsl_error(ctx, &@11, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Invalid register space reservation '%s'.", $11); + + vkd3d_free($4); + vkd3d_free($6); + vkd3d_free($8); + vkd3d_free($11); + } packoffset_reservation: ':' KW_PACKOFFSET '(' any_identifier ')' diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index a87a3652..a6d7e087 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -296,7 +296,7 @@ uniform 0 float 1.0 todo(glsl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader todo] +[pixel shader] // Numeric expr, no offset in the identifier. DXC ignores this. float a : register (c[1 + 1 * 2 * 0]); @@ -308,11 +308,11 @@ float4 main() : sv_target [test] uniform 0 float 1.0 uniform 4 float 2.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) -[pixel shader todo] +[pixel shader] // Numeric expr. DXC also ignores this. float a : register (c0[1 + 1 * 2 * 0]); @@ -324,11 +324,11 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo] +[pixel shader] // Float offsets truncate. float a : register (c0[0.6 + 0.6]); @@ -340,11 +340,11 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader todo] +[pixel shader] // Booleans are interpreted as integers in the usual way. float a : register (c0[true + false * true]); @@ -356,11 +356,11 @@ float4 main() : sv_target [test] uniform 0 float 0.0 uniform 4 float 1.0 -todo(glsl|sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) -[pixel shader fail(sm>=6) todo] +[pixel shader fail(sm>=6)] // Negative offsets. DXC fails to compile this. float a : register (c2[-1]); @@ -371,7 +371,7 @@ float4 main() : sv_target [test] uniform 4 float 1.0 -todo draw quad +todo(glsl) draw quad probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) % Weird FXC behavior. @@ -484,7 +484,7 @@ size (2d, 1, 2) [require] shader model >= 4.0 -[pixel shader todo] +[pixel shader] Texture2D tex : register(t[1]); sampler sam : register(s[1]); @@ -494,6 +494,6 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +todo(glsl) draw quad if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/register-reservations-space.shader_test b/tests/hlsl/register-reservations-space.shader_test index 71644e5e..fe42b100 100644 --- a/tests/hlsl/register-reservations-space.shader_test +++ b/tests/hlsl/register-reservations-space.shader_test @@ -30,7 +30,7 @@ todo(glsl) draw quad probe (0, 0) rgba (1, 1, 1, 99) % Bracket syntax for registers. Ignored in SM>=6. -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t[1], space0); float4 main() : sv_target @@ -39,7 +39,7 @@ float4 main() : sv_target } [test] -todo(sm<6) draw quad +todo(glsl) draw quad if(sm>=6) probe (0, 0) rgba (0, 0, 0, 99) if(sm<6) probe (0, 0) rgba (1, 1, 1, 99)

1 0

Victor Chiletto : vkd3d-shader/hlsl: Pass a pointer to struct hlsl_reg_reservation in parse_reservation_index.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: 8fb3b604bfa9a6379b594fad9d170cca014163a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8fb3b604bfa9a6379b594fad9d170… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Pass a pointer to struct hlsl_reg_reservation in parse_reservation_index. Instead of passing the struct components individually. --- libs/vkd3d-shader/hlsl.y | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 54227041..edb24911 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1214,19 +1214,20 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl return true; } -static bool parse_reservation_index(const char *string, char *type, uint32_t *index, unsigned int bracket_offset) +static bool parse_reservation_index(const char *string, unsigned int bracket_offset, + struct hlsl_reg_reservation *reservation) { char *endptr; - *type = ascii_tolower(string[0]); + reservation->reg_type = ascii_tolower(string[0]); if (string[1] == '\0') { - *index = bracket_offset; + reservation->reg_index = bracket_offset; return true; } - *index = strtoul(string + 1, &endptr, 10) + bracket_offset; + reservation->reg_index = strtoul(string + 1, &endptr, 10) + bracket_offset; if (endptr == string + 1) return false; @@ -6556,7 +6557,7 @@ register_reservation: ':' KW_REGISTER '(' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, 0)) + if (!parse_reservation_index($4, 0, &$$)) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); @@ -6565,8 +6566,7 @@ register_reservation: | ':' KW_REGISTER '(' any_identifier '[' expr ']' ')' { memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, - evaluate_static_expression_as_uint(ctx, $6, &@6))) + if (!parse_reservation_index($4, evaluate_static_expression_as_uint(ctx, $6, &@6), &$$)) { hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); @@ -6578,13 +6578,13 @@ register_reservation: | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (parse_reservation_index($6, &$$.reg_type, &$$.reg_index, 0)) + if (parse_reservation_index($6, 0, &$$)) { 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, 0)) + if (!parse_reservation_index($4, 0, &$$)) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); } @@ -6605,8 +6605,7 @@ register_reservation: hlsl_error(ctx, &@9, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register space reservation '%s'.", $9); - if (!parse_reservation_index($4, &$$.reg_type, &$$.reg_index, - evaluate_static_expression_as_uint(ctx, $6, &@6))) + if (!parse_reservation_index($4, evaluate_static_expression_as_uint(ctx, $6, &@6), &$$)) { hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); @@ -6621,8 +6620,7 @@ register_reservation: hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, - evaluate_static_expression_as_uint(ctx, $8, &@8))) + if (!parse_reservation_index($6, evaluate_static_expression_as_uint(ctx, $8, &@8), &$$)) { hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6); @@ -6637,7 +6635,7 @@ register_reservation: hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, 0)) + if (!parse_reservation_index($6, 0, &$$)) hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6); @@ -6654,8 +6652,7 @@ register_reservation: hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, &$$.reg_type, &$$.reg_index, - evaluate_static_expression_as_uint(ctx, $8, &@8))) + if (!parse_reservation_index($6, evaluate_static_expression_as_uint(ctx, $8, &@8), &$$)) { hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6);

1 0

Victor Chiletto : vkd3d-shader/hlsl: Ignore bracket offsets for 'b' register types prior to SM 5.1.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: b5b3c8b9ffffd94ee0cb7054db31c955945f9f11 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b5b3c8b9ffffd94ee0cb7054db31c… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Ignore bracket offsets for 'b' register types prior to SM 5.1. This is a fxc quirk that was fixed for SM >= 5.1 only. --- libs/vkd3d-shader/hlsl.y | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index edb24911..4b3ca8c9 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1214,13 +1214,19 @@ static bool add_effect_group(struct hlsl_ctx *ctx, const char *name, struct hlsl return true; } -static bool parse_reservation_index(const char *string, unsigned int bracket_offset, +static bool parse_reservation_index(struct hlsl_ctx *ctx, const char *string, unsigned int bracket_offset, struct hlsl_reg_reservation *reservation) { char *endptr; reservation->reg_type = ascii_tolower(string[0]); + /* Prior to SM5.1, fxc simply ignored bracket offsets for 'b' types. */ + if (reservation->reg_type == 'b' && hlsl_version_lt(ctx, 5, 1)) + { + bracket_offset = 0; + } + if (string[1] == '\0') { reservation->reg_index = bracket_offset; @@ -6557,7 +6563,7 @@ register_reservation: ':' KW_REGISTER '(' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($4, 0, &$$)) + if (!parse_reservation_index(ctx, $4, 0, &$$)) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); @@ -6566,7 +6572,7 @@ register_reservation: | ':' KW_REGISTER '(' any_identifier '[' expr ']' ')' { memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($4, evaluate_static_expression_as_uint(ctx, $6, &@6), &$$)) + if (!parse_reservation_index(ctx, $4, evaluate_static_expression_as_uint(ctx, $6, &@6), &$$)) { hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); @@ -6578,13 +6584,13 @@ register_reservation: | ':' KW_REGISTER '(' any_identifier ',' any_identifier ')' { memset(&$$, 0, sizeof($$)); - if (parse_reservation_index($6, 0, &$$)) + if (parse_reservation_index(ctx, $6, 0, &$$)) { hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); } else if (parse_reservation_space($6, &$$.reg_space)) { - if (!parse_reservation_index($4, 0, &$$)) + if (!parse_reservation_index(ctx, $4, 0, &$$)) hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); } @@ -6605,7 +6611,7 @@ register_reservation: hlsl_error(ctx, &@9, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register space reservation '%s'.", $9); - if (!parse_reservation_index($4, evaluate_static_expression_as_uint(ctx, $6, &@6), &$$)) + if (!parse_reservation_index(ctx, $4, evaluate_static_expression_as_uint(ctx, $6, &@6), &$$)) { hlsl_error(ctx, &@4, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $4); @@ -6620,7 +6626,7 @@ register_reservation: hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, evaluate_static_expression_as_uint(ctx, $8, &@8), &$$)) + if (!parse_reservation_index(ctx, $6, evaluate_static_expression_as_uint(ctx, $8, &@8), &$$)) { hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6); @@ -6635,7 +6641,7 @@ register_reservation: hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, 0, &$$)) + if (!parse_reservation_index(ctx, $6, 0, &$$)) hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6); @@ -6652,7 +6658,7 @@ register_reservation: hlsl_fixme(ctx, &@4, "Reservation shader target %s.", $4); memset(&$$, 0, sizeof($$)); - if (!parse_reservation_index($6, evaluate_static_expression_as_uint(ctx, $8, &@8), &$$)) + if (!parse_reservation_index(ctx, $6, evaluate_static_expression_as_uint(ctx, $8, &@8), &$$)) { hlsl_error(ctx, &@6, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, "Invalid register reservation '%s'.", $6);

1 0

Victor Chiletto : vkd3d-shader/hlsl: Do not immediately fail parsing for malformed 'b' register reservations.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: 27414ef9286b68c721ef60bc8367363384b24932 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/27414ef9286b68c721ef60bc83673… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Do not immediately fail parsing for malformed 'b' register reservations. This is a fxc quirk. In most cases, this throws an error, but for global variables it's completely ignored. --- libs/vkd3d-shader/hlsl.y | 16 ++++++++++++++-- tests/hlsl/register-reservations-numeric.shader_test | 6 +++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4b3ca8c9..3b5915a1 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1235,8 +1235,20 @@ static bool parse_reservation_index(struct hlsl_ctx *ctx, const char *string, un reservation->reg_index = strtoul(string + 1, &endptr, 10) + bracket_offset; - if (endptr == string + 1) - return false; + if (*endptr) + { + /* fxc for SM >= 4 treats all parse failures for 'b' types as successes, + * setting index to -1. It will later fail while validating slot limits. */ + if (reservation->reg_type == 'b' && hlsl_version_ge(ctx, 4, 0)) + { + reservation->reg_index = -1; + return true; + } + + /* All other types tolerate leftover characters. */ + if (endptr == string + 1) + return false; + } return true; } diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index a6d7e087..f5cb5f24 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -377,7 +377,7 @@ probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) % Weird FXC behavior. % SM4 accepts anything for 'b' reservations and discards it silently for global numeric variables. -[pixel shader fail(sm<4 | sm>=6) todo(sm>=4)] +[pixel shader fail(sm<4 | sm>=6)] float a : register(banana); float4 main() : sv_target @@ -387,7 +387,7 @@ float4 main() : sv_target [test] uniform 0 float 1.0 -todo(glsl | sm>=4 | sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) % Testing other reservation types. This is a parse failure, i.e "X3530: register sa not valid" @@ -451,7 +451,7 @@ float4 main() : sv_target % DXC fails during parsing. -[pixel shader fail] +[pixel shader fail todo] cbuffer buf : register(banana) { float a;

1 0

Victor Chiletto : vkd3d-shader/hlsl: Validate cbuffer register allocations.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: da36a447b81325d07eba75ed20231cd95aeba05e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da36a447b81325d07eba75ed20231… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Validate cbuffer register allocations. --- libs/vkd3d-shader/hlsl_codegen.c | 19 + .../hlsl/register-reservations-numeric.shader_test | 453 ++++++++++++++++++++- 2 files changed, 470 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 36270b15..520ba20a 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4925,6 +4925,14 @@ void hlsl_calculate_buffer_offsets(struct hlsl_ctx *ctx) } } +static unsigned int get_max_cbuffer_reg_index(struct hlsl_ctx *ctx) +{ + if (hlsl_version_ge(ctx, 5, 1)) + return UINT_MAX; + + return 13; +} + static void allocate_buffers(struct hlsl_ctx *ctx) { struct hlsl_buffer *buffer; @@ -4956,6 +4964,12 @@ static void allocate_buffers(struct hlsl_ctx *ctx) { const struct hlsl_buffer *reserved_buffer = get_reserved_buffer(ctx, reservation->reg_space, reservation->reg_index); + unsigned int max_index = get_max_cbuffer_reg_index(ctx); + + if (buffer->reservation.reg_index > max_index) + hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Buffer reservation cb%u exceeds target's maximum (cb%u).", + buffer->reservation.reg_index, max_index); if (reserved_buffer && reserved_buffer != buffer) { @@ -4980,9 +4994,14 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } else if (!reservation->reg_type) { + unsigned int max_index = get_max_cbuffer_reg_index(ctx); while (get_reserved_buffer(ctx, 0, index)) ++index; + if (index > max_index) + hlsl_error(ctx, &buffer->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, + "Too many buffers allocated, target's maximum is %u.", max_index); + buffer->reg.space = 0; buffer->reg.index = index; if (hlsl_version_ge(ctx, 5, 1)) diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index f5cb5f24..1e977271 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -433,7 +433,7 @@ probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) [require] shader model >= 4.0 -[pixel shader fail todo] +[pixel shader fail] cbuffer buf : register(b0manymanyletters) { @@ -451,7 +451,7 @@ float4 main() : sv_target % DXC fails during parsing. -[pixel shader fail todo] +[pixel shader fail] cbuffer buf : register(banana) { float a; @@ -497,3 +497,452 @@ float4 main() : sv_target todo(glsl) draw quad if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5) + +% cbuffer reservation limits. +[pixel shader] +cbuffer buf0 : register(b0) +{ + float a; +}; + +cbuffer buf1 : register(b1) +{ + float b; +}; + +cbuffer buf2 : register(b2) +{ + float c; +}; + +cbuffer buf3 : register(b3) +{ + float d; +}; + +cbuffer buf4 : register(b4) +{ + float e; +}; + +cbuffer buf5 : register(b5) +{ + float f; +}; + +cbuffer buf6 : register(b6) +{ + float g; +}; + +cbuffer buf7 : register(b7) +{ + float h; +}; + +cbuffer buf8 : register(b8) +{ + float i; +}; + +cbuffer buf9 : register(b9) +{ + float j; +}; + +cbuffer buf10 : register(b10) +{ + float k; +}; + +cbuffer buf11 : register(b11) +{ + float l; +}; + +cbuffer buf12 : register(b12) +{ + float m; +}; + +cbuffer buf13 : register(b13) +{ + float n; +}; + +float4 main() : sv_target +{ + return a * b * c * d * e * f * g * h * i * j * k * l * m * n; +} + +[pixel shader fail(sm>=6)] +// $Globals and $Params count towards the 14 cbuffer limit. +float glob; + +cbuffer buf0 : register(b0) +{ + float a; +}; + +cbuffer buf1 : register(b1) +{ + float b; +}; + +cbuffer buf2 : register(b2) +{ + float c; +}; + +cbuffer buf3 : register(b3) +{ + float d; +}; + +cbuffer buf4 : register(b4) +{ + float e; +}; + +cbuffer buf5 : register(b5) +{ + float f; +}; + +cbuffer buf6 : register(b6) +{ + float g; +}; + +cbuffer buf7 : register(b7) +{ + float h; +}; + +cbuffer buf8 : register(b8) +{ + float i; +}; + +cbuffer buf9 : register(b9) +{ + float j; +}; + +cbuffer buf10 : register(b10) +{ + float k; +}; + +cbuffer buf11 : register(b11) +{ + float l; +}; + +float4 main(uniform float param) : sv_target +{ + return glob * param * a * b * c * d * e * f * g * h * i * j * k * l; +} + +[pixel shader fail] +float glob; + +cbuffer buf0 : register(b0) +{ + float a; +}; + +cbuffer buf1 : register(b1) +{ + float b; +}; + +cbuffer buf2 : register(b2) +{ + float c; +}; + +cbuffer buf3 : register(b3) +{ + float d; +}; + +cbuffer buf4 : register(b4) +{ + float e; +}; + +cbuffer buf5 : register(b5) +{ + float f; +}; + +cbuffer buf6 : register(b6) +{ + float g; +}; + +cbuffer buf7 : register(b7) +{ + float h; +}; + +cbuffer buf8 : register(b8) +{ + float i; +}; + +cbuffer buf9 : register(b9) +{ + float j; +}; + +cbuffer buf10 : register(b10) +{ + float k; +}; + +cbuffer buf11 : register(b11) +{ + float l; +}; + +cbuffer buf12 : register(b12) +{ + float m; +}; + +float4 main(uniform float param) : sv_target +{ + return glob * param * a * b * c * d * e * f * g * h * i * j * k * l * m; +} + +[pixel shader fail todo] +// Unused cbuffers still reserve their slot, and count towards the limit. +float glob; + +cbuffer buf0 : register(b0) +{ + float a; +}; + +cbuffer buf1 : register(b1) +{ + float b; +}; + +cbuffer buf2 : register(b2) +{ + float c; +}; + +cbuffer buf3 : register(b3) +{ + float d; +}; + +cbuffer buf4 : register(b4) +{ + float e; +}; + +cbuffer buf5 : register(b5) +{ + float f; +}; + +cbuffer buf6 : register(b6) +{ + float g; +}; + +cbuffer buf7 : register(b7) +{ + float h; +}; + +cbuffer buf8 : register(b8) +{ + float i; +}; + +cbuffer buf9 : register(b9) +{ + float j; +}; + +cbuffer buf10 : register(b10) +{ + float k; +}; + +cbuffer buf11 : register(b11) +{ + float l; +}; + +cbuffer buf12 : register(b12) +{ + float m; +}; + +float4 main(uniform float param) : sv_target +{ + return glob * param * a * b * c * d * e * f * g * h * i * j * k * l; +} + +[require] +shader model >= 5.1 + +[pixel shader fail(sm>=6)] +// 5.1 and up have unlimited CBV slots. +float glob; + +cbuffer buf0 : register(b0) +{ + float a; +}; + +cbuffer buf1 : register(b1) +{ + float b; +}; + +cbuffer buf2 : register(b2) +{ + float c; +}; + +cbuffer buf3 : register(b3) +{ + float d; +}; + +cbuffer buf4 : register(b4) +{ + float e; +}; + +cbuffer buf5 : register(b5) +{ + float f; +}; + +cbuffer buf6 : register(b6) +{ + float g; +}; + +cbuffer buf7 : register(b7) +{ + float h; +}; + +cbuffer buf8 : register(b8) +{ + float i; +}; + +cbuffer buf9 : register(b9) +{ + float j; +}; + +cbuffer buf10 : register(b10) +{ + float k; +}; + +cbuffer buf11 : register(b11) +{ + float l; +}; + +cbuffer buf12 : register(b12) +{ + float m; +}; + +float4 main(uniform float param) : sv_target +{ + return glob * param * a * b * c * d * e * f * g * h * i * j * k * l * m; +} + +[pixel shader] +// SM6 doesn't support uniform parameters (why??) +float glob; + +cbuffer buf0 : register(b0) +{ + float a; +}; + +cbuffer buf1 : register(b1) +{ + float b; +}; + +cbuffer buf2 : register(b2) +{ + float c; +}; + +cbuffer buf3 : register(b3) +{ + float d; +}; + +cbuffer buf4 : register(b4) +{ + float e; +}; + +cbuffer buf5 : register(b5) +{ + float f; +}; + +cbuffer buf6 : register(b6) +{ + float g; +}; + +cbuffer buf7 : register(b7) +{ + float h; +}; + +cbuffer buf8 : register(b8) +{ + float i; +}; + +cbuffer buf9 : register(b9) +{ + float j; +}; + +cbuffer buf10 : register(b10) +{ + float k; +}; + +cbuffer buf11 : register(b11) +{ + float l; +}; + +cbuffer buf12 : register(b12) +{ + float m; +}; + +cbuffer buf13 : register(b13) +{ + float n; +}; + +float4 main() : sv_target +{ + return glob * a * b * c * d * e * f * g * h * i * j * k * l * m * n; +}

1 0

Victor Chiletto : vkd3d-shader/hlsl: Reserve register slots for unused buffers.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: abbcf0461f86222062667cc34cb9d9fcac58209d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/abbcf0461f86222062667cc34cb9d… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 vkd3d-shader/hlsl: Reserve register slots for unused buffers. --- libs/vkd3d-shader/hlsl_codegen.c | 2 +- tests/hlsl/register-reservations-numeric.shader_test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 520ba20a..f2367dc5 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -4777,7 +4777,7 @@ static const struct hlsl_buffer *get_reserved_buffer(struct hlsl_ctx *ctx, uint3 LIST_FOR_EACH_ENTRY(buffer, &ctx->buffers, const struct hlsl_buffer, entry) { - if (buffer->used_size && buffer->reservation.reg_type == 'b' + if (buffer->reservation.reg_type == 'b' && buffer->reservation.reg_space == space && buffer->reservation.reg_index == index) return buffer; } diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index 1e977271..b03bf07d 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -717,7 +717,7 @@ float4 main(uniform float param) : sv_target return glob * param * a * b * c * d * e * f * g * h * i * j * k * l * m; } -[pixel shader fail todo] +[pixel shader fail] // Unused cbuffers still reserve their slot, and count towards the limit. float glob;

1 0

Victor Chiletto : tests: Add reflection tests for register expressions.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: 44725a651b6e08b82e5210561acc63b45eaf654f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/44725a651b6e08b82e5210561acc6… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 tests: Add reflection tests for register expressions. --- tests/hlsl_d3d12.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index a38c4870..2fe41fc2 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1504,10 +1504,18 @@ static void test_reflection(void) " Texture1DArray<float> b;\n" " struct { SamplerState a; } c;\n" "} k;\n" + "cbuffer buf : register(b3[-1])\n" + "{\n" + " float4 v;\n" + "};\n" + "cbuffer buf2 : register(b[4])\n" + "{\n" + " float4 vv;\n" + "};\n" "float4 main(float2 pos : texcoord) : SV_TARGET\n" "{\n" " return a.Sample(b, pos) + a.Sample(c, pos) + a.Sample(d, pos) + tex2D(f, pos) + tex2D(e, pos)" - " + tex2D(g, pos) + h.b.Load(h.c).x + k.b.Sample(k.c.a, pos);\n" + " + tex2D(g, pos) + h.b.Load(h.c).x + k.b.Sample(k.c.a, pos) + v + vv;\n" "}"; static const D3D12_SHADER_INPUT_BIND_DESC ps_bindings[] = @@ -1525,7 +1533,9 @@ static void test_reflection(void) {"a", D3D_SIT_TEXTURE, 3, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u, 0, 3}, {"k.b", D3D_SIT_TEXTURE, 5, 1, 0, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE1DARRAY, ~0u, 0, 5}, {"h.b", D3D_SIT_TEXTURE, 7, 1, D3D_SIF_USERPACKED | D3D_SIF_TEXTURE_COMPONENT_0, D3D_RETURN_TYPE_SINT, D3D_SRV_DIMENSION_TEXTURE1D, ~0u, 0, 7}, - {"$Globals", D3D_SIT_CBUFFER, 0, 1}, + {"buf2", D3D_SIT_CBUFFER, 0, 1, D3D_SIF_USERPACKED, .uID = 0}, + {"$Globals", D3D_SIT_CBUFFER, 1, 1, .uID = 1}, + {"buf", D3D_SIT_CBUFFER, 3, 1, D3D_SIF_USERPACKED, .uID = 3}, }; static const D3D12_SHADER_TYPE_DESC ps_h_field_types[] = @@ -1544,9 +1554,22 @@ static void test_reflection(void) {{"h", 0, 8, D3D_SVF_USED, NULL, 7, 1, ~0u, 0}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 4, 0, ARRAY_SIZE(ps_h_field_types), 0, "<unnamed>"}, ps_h_field_types}, {{"i", 16, 4, 0, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_STRUCT, D3D_SVT_VOID, 1, 3, 0, ARRAY_SIZE(ps_i_field_types), 0, "<unnamed>"}, ps_i_field_types}, }; + + static const struct shader_variable ps_buf_vars[] = + { + {{"v", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, + }; + + static const struct shader_variable ps_buf2_vars[] = + { + {{"vv", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}, + }; + static const struct shader_buffer ps_buffers[] = { - {{"$Globals", D3D_CT_CBUFFER, ARRAY_SIZE(ps_globals_vars), 32}, ps_globals_vars}, + {{"$Globals", D3D_CT_CBUFFER, ARRAY_SIZE(ps_globals_vars), 32}, ps_globals_vars}, + {{"buf", D3D_CT_CBUFFER, ARRAY_SIZE(ps_buf_vars), 16}, ps_buf_vars}, + {{"buf2", D3D_CT_CBUFFER, ARRAY_SIZE(ps_buf2_vars), 16}, ps_buf2_vars}, }; static const char ps51_source[] = @@ -1559,10 +1582,12 @@ static void test_reflection(void) "RWBuffer<float> g : register(u1, space1);\n" "SamplerState h : register(s1, space2147483647);\n" "SamplerState i : register(s2147483647, space1);\n" + "cbuffer w : register(b3[-1]) { float4 j; };\n" + "cbuffer v : register(b[4]) { float4 k; };\n" "float4 main(void) : SV_TARGET\n" "{\n" " g[0] = 0;\n" - " return a + c + d + e.Sample(h, 0) + f.Sample(i, 0);\n" + " return a + c + d + e.Sample(h, 0) + f.Sample(i, 0) + j + k;\n" "}"; static const struct shader_variable ps51_x_vars = @@ -1571,11 +1596,18 @@ static void test_reflection(void) {{"c", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; static const struct shader_variable ps51_globals_vars = {{"d", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; + static const struct shader_variable ps51_w_vars = + {{"j", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; + static const struct shader_variable ps51_v_vars = + {{"k", 0, 16, D3D_SVF_USED, NULL, ~0u, 0, ~0u, 0}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}}; + static const struct shader_buffer ps51_buffers[] = { {{"$Globals", D3D_CT_CBUFFER, 1, 16}, &ps51_globals_vars}, {{"x", D3D_CT_CBUFFER, 1, 16}, &ps51_x_vars}, {{"z", D3D_CT_CBUFFER, 1, 16}, &ps51_z_vars}, + {{"w", D3D_CT_CBUFFER, 1, 16}, &ps51_w_vars}, + {{"v", D3D_CT_CBUFFER, 1, 16}, &ps51_v_vars}, }; static const D3D12_SHADER_INPUT_BIND_DESC ps51_bindings[] = @@ -1587,7 +1619,9 @@ static void test_reflection(void) {"g", D3D_SIT_UAV_RWTYPED, 1, 1, 0, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_BUFFER, ~0u, 1, 0}, {"z", D3D_SIT_CBUFFER, 0, 1, D3D_SIF_USERPACKED, .Space = 0, .uID = 0}, {"$Globals", D3D_SIT_CBUFFER, 1, 1, .uID = 1}, - {"x", D3D_SIT_CBUFFER, 0, 1, D3D_SIF_USERPACKED, .Space = 1, .uID = 2}, + {"w", D3D_SIT_CBUFFER, 2, 1, D3D_SIF_USERPACKED, .uID = 2}, + {"v", D3D_SIT_CBUFFER, 4, 1, D3D_SIF_USERPACKED, .uID = 3}, + {"x", D3D_SIT_CBUFFER, 0, 1, D3D_SIF_USERPACKED, .Space = 1, .uID = 4}, }; static const struct @@ -1598,18 +1632,19 @@ static void test_reflection(void) size_t binding_count; const struct shader_buffer *buffers; size_t buffer_count; + UINT flags; } tests[] = { - {vs_source, "vs_5_0", vs_bindings, ARRAY_SIZE(vs_bindings), vs_buffers, ARRAY_SIZE(vs_buffers)}, - {ps_source, "ps_5_0", ps_bindings, ARRAY_SIZE(ps_bindings), ps_buffers, ARRAY_SIZE(ps_buffers)}, - {ps51_source, "ps_5_1", ps51_bindings, ARRAY_SIZE(ps51_bindings), ps51_buffers, ARRAY_SIZE(ps51_buffers)}, + {vs_source, "vs_5_0", vs_bindings, ARRAY_SIZE(vs_bindings), vs_buffers, ARRAY_SIZE(vs_buffers), D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY}, + {ps_source, "ps_5_0", ps_bindings, ARRAY_SIZE(ps_bindings), ps_buffers, ARRAY_SIZE(ps_buffers), D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY}, + {ps51_source, "ps_5_1", ps51_bindings, ARRAY_SIZE(ps51_bindings), ps51_buffers, ARRAY_SIZE(ps51_buffers), 0} }; for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) { ID3D10Blob *code = compile_shader_flags(tests[t].source, - tests[t].profile, strstr(tests[t].profile, "5_1") ? 0 : D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + tests[t].profile, tests[t].flags); ID3D12ShaderReflectionConstantBuffer *cbuffer; D3D12_SHADER_TYPE_DESC type_desc, field_desc; D3D12_SHADER_INPUT_BIND_DESC binding_desc;

1 0

Victor Chiletto : tests: Add more register reservations tests.
by Alexandre Julliard 08 Jul '24

08 Jul '24

Module: vkd3d Branch: master Commit: d11c7770926c019920b26b08746289b82f3231cb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d11c7770926c019920b26b0874628… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jul 3 14:05:58 2024 -0300 tests: Add more register reservations tests. --- .../hlsl/register-reservations-numeric.shader_test | 220 +++++++++++++++++++++ .../hlsl/register-reservations-profile.shader_test | 30 +++ tests/hlsl/register-reservations-space.shader_test | 27 +++ 3 files changed, 277 insertions(+) diff --git a/tests/hlsl/register-reservations-numeric.shader_test b/tests/hlsl/register-reservations-numeric.shader_test index 1f32aa43..a87a3652 100644 --- a/tests/hlsl/register-reservations-numeric.shader_test +++ b/tests/hlsl/register-reservations-numeric.shader_test @@ -277,3 +277,223 @@ float4 main() : sv_target f += i; return f; } + +% Expressions as offsets. +[require] +% All shader models. + +[pixel shader] +// no offset at all, implicitly c0. +float a : register (c); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +todo(glsl) draw quad +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) + +[pixel shader todo] +// Numeric expr, no offset in the identifier. DXC ignores this. +float a : register (c[1 + 1 * 2 * 0]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +uniform 4 float 2.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (2.0, 2.0, 2.0, 2.0) +if(sm>=6) probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) + +[pixel shader todo] +// Numeric expr. DXC also ignores this. +float a : register (c0[1 + 1 * 2 * 0]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 1.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo] +// Float offsets truncate. +float a : register (c0[0.6 + 0.6]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 1.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader todo] +// Booleans are interpreted as integers in the usual way. +float a : register (c0[true + false * true]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 1.0 +todo(glsl|sm<6) draw quad +if(sm<6) probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=6) probe (0, 0) rgba (0.0, 0.0, 0.0, 0.0) + +[pixel shader fail(sm>=6) todo] +// Negative offsets. DXC fails to compile this. +float a : register (c2[-1]); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 4 float 1.0 +todo draw quad +probe (0, 0) rgba (1.0, 1.0, 1.0, 1.0) + +% Weird FXC behavior. +% SM4 accepts anything for 'b' reservations and discards it silently for global numeric variables. + +[pixel shader fail(sm<4 | sm>=6) todo(sm>=4)] +float a : register(banana); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +todo(glsl | sm>=4 | sm<6) draw quad +probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) + +% Testing other reservation types. This is a parse failure, i.e "X3530: register sa not valid" + +[pixel shader fail] + +sampler s : register(samply); + +float4 main() : sv_target +{ + return tex2D(s, float2(0, 0)); +} + +% This seems to parse fine, but fails with a different error message: "X3530: sampler requires an 's' or 't' register". +% Resource types probably have extra validation. + +[pixel shader fail] + +sampler s : register(banana); + +float4 main() : sv_target +{ + return tex2D(s, float2(0, 0)); +} + +% Trailing characters after the reservation index are okay in SM < 6, except for 'b' reservations + +[pixel shader fail(sm>=6)] + +float a : register(c1manymanyletters); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 0.0 +uniform 4 float 2.0 +todo(glsl) draw quad +probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) + +[require] +shader model >= 4.0 + +[pixel shader fail todo] + +cbuffer buf : register(b0manymanyletters) +{ + float a; +} + +float4 main() : sv_target +{ + return a; +} + +% SM4 fails, but not during parsing: it tries to reserve slot 4294967295 (i.e UINT_MAX) for the constant buffer. +% It'll attempt to reserve the same slot even if an offset is passed in brackets, which suggests it uses -1 +% as a "parsing failure" flag. + +% DXC fails during parsing. + +[pixel shader fail] +cbuffer buf : register(banana) +{ + float a; +} + +float4 main() : sv_target +{ + return a; +} + +% Some versions of fxc's SM5.1 completely ignore bracket exprs for samplers and textures. +% This was fixed (?) in later versions. + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[sampler 1] +filter point point point +address clamp clamp clamp + +[srv 0] +size (2d, 1, 2) +0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0 + +[srv 1] +size (2d, 1, 2) +1.0 1.0 1.0 1.0 2.0 2.0 2.0 2.0 + +[require] +shader model >= 4.0 + +[pixel shader todo] +Texture2D tex : register(t[1]); +sampler sam : register(s[1]); + +float4 main() : sv_target +{ + return tex.Sample(sam, float2(0, 0.5)); +} + +[test] +todo(sm<6) draw quad +if(sm<6) probe (0, 0) rgba(2.0, 2.0, 2.0, 2.0) +if(sm>=6) probe (0, 0) rgba(0.5, 0.5, 0.5, 0.5) diff --git a/tests/hlsl/register-reservations-profile.shader_test b/tests/hlsl/register-reservations-profile.shader_test index a747ea6d..8b052231 100644 --- a/tests/hlsl/register-reservations-profile.shader_test +++ b/tests/hlsl/register-reservations-profile.shader_test @@ -259,3 +259,33 @@ float4 main() : sv_target [test] todo(sm<6) draw quad probe (0, 0) rgba (1, 1, 1, 99) + +% Bracket exprs should still parse correctly. + +[pixel shader todo] +Texture2D tex1 : register(ps, t[1]); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe (0, 0) rgba(0, 0, 0, 99) +if(sm<6) probe (0, 0) rgba(1, 1, 1, 99) + +% This works, though the bind point is ignored. + +[pixel shader fail(sm>=6) todo(sm<6)] +float a : register(ps[5], c1); + +float4 main() : sv_target +{ + return a; +} + +[test] +uniform 0 float 1.0 +todo draw quad +probe (0, 0) rgba(1.0, 1.0, 1.0, 1.0) diff --git a/tests/hlsl/register-reservations-space.shader_test b/tests/hlsl/register-reservations-space.shader_test index 48fac6f4..71644e5e 100644 --- a/tests/hlsl/register-reservations-space.shader_test +++ b/tests/hlsl/register-reservations-space.shader_test @@ -29,6 +29,19 @@ float4 main() : sv_target todo(glsl) draw quad probe (0, 0) rgba (1, 1, 1, 99) +% Bracket syntax for registers. Ignored in SM>=6. +[pixel shader todo] +Texture2D tex1 : register(t[1], space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe (0, 0) rgba (0, 0, 0, 99) +if(sm<6) probe (0, 0) rgba (1, 1, 1, 99) [pixel shader fail(sm>=6)] Texture2D tex1 : register(t1, sPaCe0); @@ -94,6 +107,20 @@ todo(sm<6) draw quad if(sm>=6) probe (0,0) rgba (2, 2, 2, 99) if(sm<6) probe (0,0) rgba (1, 1, 1, 99) +% Same as above, but with bracket exprs, which are ignored in SM>=6. + +[pixel shader todo] +Texture2D tex1 : register(vs, t[1], space0) : register(ps, t[2], space0); + +float4 main() : sv_target +{ + return tex1.Load(int3(0, 0, 0)); +} + +[test] +todo(sm<6) draw quad +if(sm>=6) probe (0, 0) rgba (0, 0, 0, 99) +if(sm<6) probe (0, 0) rgba (1, 1, 1, 99) % This actually inheres to 5.1+; it doesn't matter whether "space" is specified.

1 0