June 2023 - Wine-commits - list.winehq.org

Giovanni Mascellani : vkd3d-shader/hlsl: Fold less-than comparisons.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: bf452b5907df5f4e92a73ba817c084709f7b5c73 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf452b5907df5f4e92a73ba817c08… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:25:51 2023 +0200 vkd3d-shader/hlsl: Fold less-than comparisons. --- libs/vkd3d-shader/hlsl_constant_ops.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 6ba059fa..9232cd77 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -406,6 +406,45 @@ static bool fold_equal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, co return true; } +static bool fold_less(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) +{ + unsigned int k; + + assert(dst_type->base_type == HLSL_TYPE_BOOL); + assert(src1->node.data_type->base_type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (src1->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].u = src1->value.u[k].f < src2->value.u[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].u = src1->value.u[k].d < src2->value.u[k].d; + break; + + case HLSL_TYPE_INT: + dst->u[k].u = src1->value.u[k].i < src2->value.u[k].i; + break; + + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->u[k].u = src1->value.u[k].u < src2->value.u[k].u; + break; + + default: + vkd3d_unreachable(); + } + + dst->u[k].u *= ~0u; + } + return true; +} + static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { @@ -647,6 +686,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_equal(ctx, &res, instr->data_type, arg1, arg2); break; + case HLSL_OP2_LESS: + success = fold_less(ctx, &res, instr->data_type, arg1, arg2); + break; + case HLSL_OP2_MAX: success = fold_max(ctx, &res, instr->data_type, arg1, arg2); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold greater-than-or-equal comparisons.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 358d656262666de4a23bcb1f0675b2ac96a888ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/358d656262666de4a23bcb1f0675b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:27:03 2023 +0200 vkd3d-shader/hlsl: Fold greater-than-or-equal comparisons. --- libs/vkd3d-shader/hlsl_constant_ops.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 9232cd77..00bacbf5 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -406,6 +406,45 @@ static bool fold_equal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, co return true; } +static bool fold_gequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, + const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) +{ + unsigned int k; + + assert(dst_type->base_type == HLSL_TYPE_BOOL); + assert(src1->node.data_type->base_type == src2->node.data_type->base_type); + + for (k = 0; k < 4; ++k) + { + switch (src1->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].u = src1->value.u[k].f >= src2->value.u[k].f; + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].u = src1->value.u[k].d >= src2->value.u[k].d; + break; + + case HLSL_TYPE_INT: + dst->u[k].u = src1->value.u[k].i >= src2->value.u[k].i; + break; + + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + dst->u[k].u = src1->value.u[k].u >= src2->value.u[k].u; + break; + + default: + vkd3d_unreachable(); + } + + dst->u[k].u *= ~0u; + } + return true; +} + static bool fold_less(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { @@ -686,6 +725,10 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, success = fold_equal(ctx, &res, instr->data_type, arg1, arg2); break; + case HLSL_OP2_GEQUAL: + success = fold_gequal(ctx, &res, instr->data_type, arg1, arg2); + break; + case HLSL_OP2_LESS: success = fold_less(ctx, &res, instr->data_type, arg1, arg2); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold floating point maximum expressions.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 2a2943c2cf962c90eda6732288b6bd0c3c873050 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a2943c2cf962c90eda6732288b6b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:30:12 2023 +0200 vkd3d-shader/hlsl: Fold floating point maximum expressions. --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 00bacbf5..edfc898e 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -497,6 +497,15 @@ static bool fold_max(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons { switch (type) { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = fmaxf(src1->value.u[k].f, src2->value.u[k].f); + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].d = fmax(src1->value.u[k].d, src2->value.u[k].d); + break; + case HLSL_TYPE_INT: dst->u[k].i = max(src1->value.u[k].i, src2->value.u[k].i); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold floating point minimum expressions.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 5a05fabe6299f60d942f18189ce5d53afe6774b1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a05fabe6299f60d942f18189ce5d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:30:56 2023 +0200 vkd3d-shader/hlsl: Fold floating point minimum expressions. --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index edfc898e..b9bca0d3 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -535,6 +535,15 @@ static bool fold_min(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons { switch (type) { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + dst->u[k].f = fminf(src1->value.u[k].f, src2->value.u[k].f); + break; + + case HLSL_TYPE_DOUBLE: + dst->u[k].d = fmin(src1->value.u[k].d, src2->value.u[k].d); + break; + case HLSL_TYPE_INT: dst->u[k].i = min(src1->value.u[k].i, src2->value.u[k].i); break;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold logical expressions.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: bdfec4886da209d60a532656ebee4b05ec307425 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bdfec4886da209d60a532656ebee4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 9 22:39:25 2023 +0200 vkd3d-shader/hlsl: Fold logical expressions. --- libs/vkd3d-shader/hlsl_constant_ops.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index b9bca0d3..570773cd 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -223,7 +223,7 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, cons return true; } -static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, +static bool fold_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { enum hlsl_base_type type = dst_type->base_type; @@ -238,18 +238,19 @@ static bool fold_bit_and(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: dst->u[k].u = src1->value.u[k].u & src2->value.u[k].u; break; default: - FIXME("Fold bit and for type %s.\n", debug_hlsl_type(ctx, dst_type)); + FIXME("Fold bit/logic and for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } return true; } -static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, +static bool fold_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2) { enum hlsl_base_type type = dst_type->base_type; @@ -264,11 +265,12 @@ static bool fold_bit_or(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, c { case HLSL_TYPE_INT: case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: dst->u[k].u = src1->value.u[k].u | src2->value.u[k].u; break; default: - FIXME("Fold bit or for type %s.\n", debug_hlsl_type(ctx, dst_type)); + FIXME("Fold bit/logic or for type %s.\n", debug_hlsl_type(ctx, dst_type)); return false; } } @@ -724,11 +726,13 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, break; case HLSL_OP2_BIT_AND: - success = fold_bit_and(ctx, &res, instr->data_type, arg1, arg2); + case HLSL_OP2_LOGIC_AND: + success = fold_and(ctx, &res, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_OR: - success = fold_bit_or(ctx, &res, instr->data_type, arg1, arg2); + case HLSL_OP2_LOGIC_OR: + success = fold_or(ctx, &res, instr->data_type, arg1, arg2); break; case HLSL_OP2_BIT_XOR:

1 0

Zebediah Figura : tests: Use compare_uint() in compare_float().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 69ecfdfb0bf9e5fddc3b74732f7db94e4948f24e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/69ecfdfb0bf9e5fddc3b74732f7db… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 23 15:36:26 2023 -0500 tests: Use compare_uint() in compare_float(). Comparing the result of abs() is broken in the case that x - y == INT_MIN. --- tests/d3d12_test_utils.h | 7 ------- tests/utils.h | 12 ++++++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 19105e19..ec5ba5c5 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -74,13 +74,6 @@ static void set_viewport(D3D12_VIEWPORT *vp, float x, float y, vp->MaxDepth = max_depth; } -static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) -{ - unsigned int diff = x > y ? x - y : y - x; - - return diff <= max_diff; -} - static bool compare_color(DWORD c1, DWORD c2, BYTE max_diff) { return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) diff --git a/tests/utils.h b/tests/utils.h index 5fd7b086..67094190 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -82,6 +82,13 @@ static inline bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t return true; } +static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static bool compare_float(float f, float g, unsigned int ulps) { int x, y; @@ -101,10 +108,7 @@ static bool compare_float(float f, float g, unsigned int ulps) if (y < 0) y = INT_MIN - y; - if (abs(x - y) > ulps) - return false; - - return true; + return compare_uint(x, y, ulps); } static inline bool compare_uvec4(const struct uvec4 *v1, const struct uvec4 *v2)

1 0

Nikolay Sivov : tests: Add another test for register reservation.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 3aee386e2fdf2e0bf65e7006a380f204a1e571f4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3aee386e2fdf2e0bf65e7006a380f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 25 23:03:53 2023 +0200 tests: Add another test for register reservation. --- tests/register-reservations.shader_test | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/register-reservations.shader_test b/tests/register-reservations.shader_test index 26f4381d..d885b209 100644 --- a/tests/register-reservations.shader_test +++ b/tests/register-reservations.shader_test @@ -142,3 +142,17 @@ float4 main() : sv_target [test] draw quad probe all rgba (2.0, 2.0, 2.0, 99.0) + + +[pixel shader todo] +Texture2D tex1 : register(t2); +Texture2D tex2 : register(t2); + +float4 main() : sv_target +{ + return tex2.Load(int3(0, 0, 0)); +} + +[test] +todo draw quad +probe all rgba (2.0, 2.0, 2.0, 99.0)

1 0

Zebediah Figura : vkd3d-shader: Introduce documented semantics for the target type and other data passed to vkd3d_shader_scan().
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 7b9eb8d189e999a927c1e058d761d8553c9639e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b9eb8d189e999a927c1e058d761d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jun 25 13:20:53 2023 -0500 vkd3d-shader: Introduce documented semantics for the target type and other data passed to vkd3d_shader_scan(). Passing VKD3D_SHADER_TARGET_NONE was actually already allowed. --- include/vkd3d_shader.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 27424154..33e51384 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -620,7 +620,7 @@ enum vkd3d_shader_target_type { /** * The shader has no type or is to be ignored. This is not a valid value - * for vkd3d_shader_compile() or vkd3d_shader_scan(). + * for vkd3d_shader_compile(). */ VKD3D_SHADER_TARGET_NONE, /** @@ -1784,6 +1784,26 @@ VKD3D_SHADER_API int vkd3d_shader_convert_root_signature(struct vkd3d_shader_ver * Parse shader source code or byte code, returning various types of requested * information. * + * The \a source_type member of \a compile_info must be set to the type of the + * shader. + * + * The \a target_type member may be set to VKD3D_SHADER_TARGET_NONE, in which + * case vkd3d_shader_scan() will return information about the shader in + * isolation. Alternatively, it may be set to a valid compilation target for the + * shader, in which case vkd3d_shader_scan() will return information that + * reflects the interface for a shader as it will be compiled to that target. + * In this case other chained structures may be appended to \a compile_info as + * they would be passed to vkd3d_shader_compile(), and interpreted accordingly, + * such as vkd3d_shader_spirv_target_info. + * + * (For a hypothetical example, suppose the source shader distinguishes float + * and integer texture data, but the target environment does not support integer + * textures. In this case vkd3d_shader_compile() might translate integer + * operations to float. Accordingly using VKD3D_SHADER_TARGET_NONE would + * accurately report whether the texture expects integer or float data, but + * using the relevant specific target type would report + * VKD3D_SHADER_RESOURCE_DATA_FLOAT.) + * * Currently this function supports the following code types: * - VKD3D_SHADER_SOURCE_DXBC_TPF *

1 0

Zebediah Figura : vkd3d-shader: Introduce an API to retrieve all signatures from DXBC shaders.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 20190a138875e806c28f7b4bd7346f5c7cf43471 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/20190a138875e806c28f7b4bd7346… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Feb 23 16:21:18 2023 -0600 vkd3d-shader: Introduce an API to retrieve all signatures from DXBC shaders. --- include/vkd3d_shader.h | 69 ++++++++++++- libs/vkd3d-shader/vkd3d_shader.map | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 116 ++++++++++++++------- tests/vkd3d_shader_api.c | 187 ++++++++++++++++++++++++++++++++++ 4 files changed, 335 insertions(+), 38 deletions(-)

1 0

Zebediah Figura : vkd3d-shader: Synthesize signatures for d3dbc shaders.
by Alexandre Julliard 27 Jun '23

27 Jun '23

Module: vkd3d Branch: master Commit: 7e1fcdca899e7720b141495f9b62aec5fd6d3deb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e1fcdca899e7720b141495f9b62a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 24 13:12:30 2023 -0600 vkd3d-shader: Synthesize signatures for d3dbc shaders. --- include/vkd3d_shader.h | 28 +++- libs/vkd3d-shader/d3dbc.c | 256 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 + tests/vkd3d_shader_api.c | 154 ++++++++++++++++++- 4 files changed, 431 insertions(+), 10 deletions(-)

1 0