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

Conor McCarthy : vkd3d-shader/dxil: Emit an error if a LOAD instruction uses a forward-referenced pointer.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: b4b5af66ef05c1eeea741e25332abd3352c56e03 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4b5af66ef05c1eeea741e25332ab… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 00:11:29 2024 +1000 vkd3d-shader/dxil: Emit an error if a LOAD instruction uses a forward-referenced pointer. --- libs/vkd3d-shader/dxil.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 1bc389ca..ce6d869d 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -606,6 +606,7 @@ struct sm6_value enum sm6_value_type value_type; unsigned int structure_stride; bool is_undefined; + bool is_back_ref; union { struct sm6_function_data function; @@ -2658,6 +2659,18 @@ static bool sm6_value_validate_is_pointer(const struct sm6_value *value, struct return true; } +static bool sm6_value_validate_is_backward_ref(const struct sm6_value *value, struct sm6_parser *sm6) +{ + if (!value->is_back_ref) + { + FIXME("Forward-referenced pointers are not supported.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Forward-referenced pointer declarations are not supported."); + return false; + } + return true; +} + static bool sm6_value_validate_is_numeric(const struct sm6_value *value, struct sm6_parser *sm6) { if (!sm6_type_is_numeric(value->type)) @@ -3135,6 +3148,7 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const dst = sm6_parser_get_current_value(sm6); dst->type = type; dst->value_type = VALUE_TYPE_REG; + dst->is_back_ref = true; vsir_register_init(&dst->u.reg, reg_type, reg_data_type, 0); switch (record->code) @@ -3462,6 +3476,7 @@ static bool sm6_parser_declare_global(struct sm6_parser *sm6, const struct dxil_ dst = sm6_parser_get_current_value(sm6); dst->type = type; dst->value_type = VALUE_TYPE_REG; + dst->is_back_ref = true; if (is_constant && !init) { @@ -6687,6 +6702,7 @@ static void sm6_parser_emit_load(struct sm6_parser *sm6, const struct dxil_recor return; if (!sm6_value_validate_is_register(ptr, sm6) || !sm6_value_validate_is_pointer(ptr, sm6) + || !sm6_value_validate_is_backward_ref(ptr, sm6) || !dxil_record_validate_operand_count(record, i + 2, i + 3, sm6)) return; @@ -7478,6 +7494,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const fwd_type = dst->type; dst->type = NULL; dst->value_type = VALUE_TYPE_REG; + dst->is_back_ref = true; is_terminator = false; record = block->records[i];

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit an error if a STORE instruction uses a forward-referenced pointer.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 9615c38968aee04dcec4df42c9fbf2a986655ef6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9615c38968aee04dcec4df42c9fbf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 00:12:35 2024 +1000 vkd3d-shader/dxil: Emit an error if a STORE instruction uses a forward-referenced pointer. --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index ce6d869d..99227d80 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6886,7 +6886,8 @@ static void sm6_parser_emit_store(struct sm6_parser *sm6, const struct dxil_reco if (!(ptr = sm6_parser_get_value_by_ref(sm6, record, NULL, &i)) || !sm6_value_validate_is_register(ptr, sm6) - || !sm6_value_validate_is_pointer(ptr, sm6)) + || !sm6_value_validate_is_pointer(ptr, sm6) + || !sm6_value_validate_is_backward_ref(ptr, sm6)) { return; }

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit an error if a ATOMICRMW instruction uses a forward-referenced pointer.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: b67a68b486fc47cff3fb11a634fbb67da1ffab0b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b67a68b486fc47cff3fb11a634fbb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 00:12:54 2024 +1000 vkd3d-shader/dxil: Emit an error if a ATOMICRMW instruction uses a forward-referenced pointer. --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 99227d80..5bb05058 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3961,7 +3961,8 @@ static void sm6_parser_emit_atomicrmw(struct sm6_parser *sm6, const struct dxil_ uint64_t code; if (!(ptr = sm6_parser_get_value_by_ref(sm6, record, NULL, &i)) - || !sm6_value_validate_is_pointer_to_i32(ptr, sm6)) + || !sm6_value_validate_is_pointer_to_i32(ptr, sm6) + || !sm6_value_validate_is_backward_ref(ptr, sm6)) return; if (ptr->u.reg.type != VKD3DSPR_GROUPSHAREDMEM)

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit an error if a CMPXCHG instruction uses a forward-referenced pointer.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 05510c118ab07c323307b9bde886c8c65f586b73 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/05510c118ab07c323307b9bde886c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 00:13:10 2024 +1000 vkd3d-shader/dxil: Emit an error if a CMPXCHG instruction uses a forward-referenced pointer. --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 5bb05058..556902c2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -6462,7 +6462,8 @@ static void sm6_parser_emit_cmpxchg(struct sm6_parser *sm6, const struct dxil_re uint64_t code; if (!(ptr = sm6_parser_get_value_by_ref(sm6, record, NULL, &i)) - || !sm6_value_validate_is_pointer_to_i32(ptr, sm6)) + || !sm6_value_validate_is_pointer_to_i32(ptr, sm6) + || !sm6_value_validate_is_backward_ref(ptr, sm6)) return; if (ptr->u.reg.type != VKD3DSPR_GROUPSHAREDMEM)

1 0

Conor McCarthy : tests/hlsl: Add a test for constexpr pointer cast.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 2fc32c3d1da8c0794d5f6309f324e3238e05f9c4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2fc32c3d1da8c0794d5f6309f324e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 27 20:35:07 2024 +1000 tests/hlsl: Add a test for constexpr pointer cast. --- Makefile.am | 1 + tests/hlsl/pointer-cast.shader_test | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/Makefile.am b/Makefile.am index 50a5e8b3..5820a8b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,6 +163,7 @@ vkd3d_shader_tests = \ tests/hlsl/object-field-offsets.shader_test \ tests/hlsl/object-parameters.shader_test \ tests/hlsl/object-references.shader_test \ + tests/hlsl/pointer-cast.shader_test \ tests/hlsl/pow.shader_test \ tests/hlsl/precise-modifier.shader_test \ tests/hlsl/rasteriser-ordered-views.shader_test \ diff --git a/tests/hlsl/pointer-cast.shader_test b/tests/hlsl/pointer-cast.shader_test new file mode 100644 index 00000000..7cbcfc8f --- /dev/null +++ b/tests/hlsl/pointer-cast.shader_test @@ -0,0 +1,23 @@ +[require] +shader model >= 6.0 + +[pixel shader] +uint u, v, w; + +static float foo[3] = {0.25, 0.5, 0.75}; + +float4 main(float4 pos : SV_Position) : SV_Target +{ + // Compiles to a constexpr uint pointer cast of foo for a store instruction. + if (v) + foo[1] = asfloat(w); + return float4(foo[u], foo[u + 1], 0.0, 1.0); +} + +[test] +uniform 0 uint4 0 1 0x3e000000 0 +todo draw quad +probe all rgba (0.25, 0.125, 0.0, 1.0) +uniform 0 uint4 1 0 0x3e000000 0 +todo draw quad +probe all rgba (0.5, 0.75, 0.0, 1.0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle constexpr pointer cast.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: fb730b11cfb73a0fd972ed917d074e80d86dd565 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb730b11cfb73a0fd972ed917d074… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 15 12:08:46 2024 +1000 vkd3d-shader/dxil: Handle constexpr pointer cast. --- libs/vkd3d-shader/dxil.c | 78 ++++++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +++ tests/hlsl/pointer-cast.shader_test | 4 +- 3 files changed, 83 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 556902c2..6453eba3 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -103,6 +103,7 @@ enum bitcode_constant_code CST_CODE_INTEGER = 4, CST_CODE_FLOAT = 6, CST_CODE_STRING = 8, + CST_CODE_CE_CAST = 11, CST_CODE_CE_GEP = 12, CST_CODE_CE_INBOUNDS_GEP = 20, CST_CODE_DATA = 22, @@ -2217,6 +2218,11 @@ static bool sm6_value_is_ssa(const struct sm6_value *value) return sm6_value_is_register(value) && register_is_ssa(&value->u.reg); } +static bool sm6_value_is_numeric_array(const struct sm6_value *value) +{ + return sm6_value_is_register(value) && register_is_numeric_array(&value->u.reg); +} + static inline unsigned int sm6_value_get_constant_uint(const struct sm6_value *value) { if (!sm6_value_is_constant(value)) @@ -3099,15 +3105,16 @@ static enum vkd3d_result sm6_parser_init_constexpr_gep(struct sm6_parser *sm6, c static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const struct dxil_block *block) { enum vkd3d_shader_register_type reg_type = VKD3DSPR_INVALID; - const struct sm6_type *type, *elem_type; + const struct sm6_type *type, *elem_type, *ptr_type; + size_t i, base_value_idx, value_idx; enum vkd3d_data_type reg_data_type; const struct dxil_record *record; + const struct sm6_value *src; enum vkd3d_result ret; struct sm6_value *dst; - size_t i, value_idx; uint64_t value; - for (i = 0, type = NULL; i < block->record_count; ++i) + for (i = 0, type = NULL, base_value_idx = sm6->value_count; i < block->record_count; ++i) { sm6->p.location.column = i; record = block->records[i]; @@ -3223,6 +3230,48 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const return ret; break; + case CST_CODE_CE_CAST: + if (!dxil_record_validate_operand_count(record, 3, 3, sm6)) + return VKD3D_ERROR_INVALID_SHADER; + + if ((value = record->operands[0]) != CAST_BITCAST) + { + WARN("Unhandled constexpr cast op %"PRIu64".\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Constexpr cast op %"PRIu64" is unhandled.", value); + return VKD3D_ERROR_INVALID_SHADER; + } + + ptr_type = sm6_parser_get_type(sm6, record->operands[1]); + if (!sm6_type_is_pointer(ptr_type)) + { + WARN("Constexpr cast at constant idx %zu is not a pointer.\n", value_idx); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Constexpr cast source operand is not a pointer."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if ((value = record->operands[2]) >= sm6->cur_max_value) + { + WARN("Invalid value index %"PRIu64".\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid value index %"PRIu64".", value); + return VKD3D_ERROR_INVALID_SHADER; + } + else if (value == value_idx) + { + WARN("Invalid value self-reference at %"PRIu64".\n", value); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid value self-reference for a constexpr cast."); + return VKD3D_ERROR_INVALID_SHADER; + } + + /* Resolve later in case forward refs exist. */ + dst->type = type; + dst->u.reg.type = VKD3DSPR_COUNT; + dst->u.reg.idx[0].offset = value; + break; + case CST_CODE_UNDEF: dxil_record_validate_operand_max_count(record, 0, sm6); dst->u.reg.type = VKD3DSPR_UNDEF; @@ -3248,6 +3297,29 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const ++sm6->value_count; } + /* Resolve cast forward refs. */ + for (i = base_value_idx; i < sm6->value_count; ++i) + { + dst = &sm6->values[i]; + if (dst->u.reg.type != VKD3DSPR_COUNT) + continue; + + type = dst->type; + + src = &sm6->values[dst->u.reg.idx[0].offset]; + if (!sm6_value_is_numeric_array(src)) + { + WARN("Value is not an array.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Constexpr cast source value is not a global array element."); + return VKD3D_ERROR_INVALID_SHADER; + } + + *dst = *src; + dst->type = type; + dst->u.reg.data_type = vkd3d_data_type_from_sm6_type(type->u.pointer.type); + } + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 4bb99efe..165126b5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1241,6 +1241,12 @@ static inline bool register_is_scalar_constant_zero(const struct vkd3d_shader_re && (data_type_is_64_bit(reg->data_type) ? !reg->u.immconst_u64[0] : !reg->u.immconst_u32[0]); } +static inline bool register_is_numeric_array(const struct vkd3d_shader_register *reg) +{ + return (reg->type == VKD3DSPR_IMMCONSTBUFFER || reg->type == VKD3DSPR_IDXTEMP + || reg->type == VKD3DSPR_GROUPSHAREDMEM); +} + static inline bool vsir_register_is_label(const struct vkd3d_shader_register *reg) { return reg->type == VKD3DSPR_LABEL; diff --git a/tests/hlsl/pointer-cast.shader_test b/tests/hlsl/pointer-cast.shader_test index 7cbcfc8f..6821abab 100644 --- a/tests/hlsl/pointer-cast.shader_test +++ b/tests/hlsl/pointer-cast.shader_test @@ -16,8 +16,8 @@ float4 main(float4 pos : SV_Position) : SV_Target [test] uniform 0 uint4 0 1 0x3e000000 0 -todo draw quad +draw quad probe all rgba (0.25, 0.125, 0.0, 1.0) uniform 0 uint4 1 0 0x3e000000 0 -todo draw quad +draw quad probe all rgba (0.5, 0.75, 0.0, 1.0)

1 0

Conor McCarthy : tests/hlsl: Add an SV_InstanceId test.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: 0bd6083785c9db320facb9ed519d23aacf9f9b95 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0bd6083785c9db320facb9ed519d2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 12:55:44 2024 +1000 tests/hlsl: Add an SV_InstanceId test. --- Makefile.am | 1 + tests/hlsl/instance-id.shader_test | 49 ++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 9 ++++--- tests/shader_runner.h | 3 ++- tests/shader_runner_d3d11.c | 4 ++-- tests/shader_runner_d3d12.c | 4 ++-- tests/shader_runner_d3d9.c | 5 +++- tests/shader_runner_gl.c | 4 ++-- tests/shader_runner_vulkan.c | 4 ++-- 9 files changed, 70 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5820a8b1..da6200bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,6 +132,7 @@ vkd3d_shader_tests = \ tests/hlsl/initializer-static-array.shader_test \ tests/hlsl/initializer-struct.shader_test \ tests/hlsl/intrinsic-override.shader_test \ + tests/hlsl/instance-id.shader_test \ tests/hlsl/invalid.shader_test \ tests/hlsl/inverse-trig.shader_test \ tests/hlsl/is-front-face.shader_test \ diff --git a/tests/hlsl/instance-id.shader_test b/tests/hlsl/instance-id.shader_test new file mode 100644 index 00000000..b0465670 --- /dev/null +++ b/tests/hlsl/instance-id.shader_test @@ -0,0 +1,49 @@ +[require] +shader model >= 4.0 + +[vertex shader] +struct vs_in +{ + uint instance_id : SV_InstanceId; + uint vertex_id : SV_VertexId; +}; + +struct vs_out +{ + float4 position : SV_Position; + float4 color : Color; +}; + +void main(vs_in i, out vs_out o) +{ + float2 vertices[] = + { + {0.0, 0.0}, { 0.0, 2.0}, {-2.0, 0.0}, + {0.0, 0.0}, { 2.0, 0.0}, { 0.0, 2.0}, + {0.0, 0.0}, { 0.0, -2.0}, { 2.0, 0.0}, + {0.0, 0.0}, {-2.0, 0.0}, { 0.0, -2.0}, + }; + uint pos = i.vertex_id % 3; + o.position = float4(vertices[pos + i.instance_id * 3], 0.0, 1.0); + float color = 0.25 + i.instance_id * 0.25; + o.color = float4(0.0, color, 0.0, color); +} + +[pixel shader] +struct vs_out +{ + float4 position : SV_Position; + float4 color : Color; +}; + +float4 main(vs_out i) : SV_Target +{ + return i.color; +} + +[test] +todo(sm>=6 | glsl) draw triangle list 3 4 +probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25) +probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5) +probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75) +probe rtv 0 (160, 360) rgba (0.0, 1.0, 0.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 8e6fdf9b..b4b440de 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -930,13 +930,13 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->last_render_failed = !runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); + runner->last_render_failed = !runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3, 1); } else if (match_string(line, "draw", &line)) { + unsigned int vertex_count, instance_count; D3D_PRIMITIVE_TOPOLOGY topology; struct resource_params params; - unsigned int vertex_count; if (!runner->hs_source != !runner->ds_source) fatal_error("Have a domain or hull shader but not both.\n"); @@ -975,8 +975,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) vertex_count = strtoul(line, &rest, 10); if (line == rest) fatal_error("Malformed vertex count '%s'.\n", line); + instance_count = strtoul(line = rest, &rest, 10); + if (line == rest) + instance_count = 1; - runner->last_render_failed = !runner->ops->draw(runner, topology, vertex_count); + runner->last_render_failed = !runner->ops->draw(runner, topology, vertex_count, instance_count); } else if (match_string(line, "probe", &line)) { diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 5f061fa7..9d41d759 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -196,7 +196,8 @@ struct shader_runner_ops struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); void (*clear)(struct shader_runner *runner, struct resource *resource, const struct vec4 *clear_value); - bool (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); + bool (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, + unsigned int instance_count); bool (*dispatch)(struct shader_runner *runner, unsigned int x, unsigned int y, unsigned int z); struct resource_readback *(*get_resource_readback)(struct shader_runner *runner, struct resource *resource); void (*release_readback)(struct shader_runner *runner, struct resource_readback *rb); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index bb1d00d6..9eb8ac4e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -634,7 +634,7 @@ static void d3d11_runner_clear(struct shader_runner *r, struct resource *res, co } static bool d3d11_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { ID3D11UnorderedAccessView *uavs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; ID3D11RenderTargetView *rtvs[D3D11_PS_CS_UAV_REGISTER_COUNT] = {0}; @@ -812,7 +812,7 @@ static bool d3d11_runner_draw(struct shader_runner *r, ID3D11DeviceContext_DSSetShader(context, ds, NULL, 0); ID3D11DeviceContext_RSSetState(context, runner->rasterizer_state); - ID3D11DeviceContext_Draw(context, vertex_count, 0); + ID3D11DeviceContext_DrawInstanced(context, vertex_count, instance_count, 0, 0); ID3D11PixelShader_Release(ps); ID3D11VertexShader_Release(vs); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 8119a66e..37780682 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -494,7 +494,7 @@ static void d3d12_runner_clear(struct shader_runner *r, struct resource *resourc } static bool d3d12_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; @@ -676,7 +676,7 @@ static bool d3d12_runner_draw(struct shader_runner *r, ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &test_context->viewport); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, primitive_topology); ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); - ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, 1, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, vertex_count, instance_count, 0, 0); /* Finish the command list so that we can destroy objects. */ hr = ID3D12GraphicsCommandList_Close(command_list); diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index f61a2305..d427576d 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -330,7 +330,7 @@ static void d3d9_runner_clear(struct shader_runner *r, struct resource *resource } static bool d3d9_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { static const D3DVERTEXELEMENT9 decl_element_end = D3DDECL_END(); struct d3d9_shader_runner *runner = d3d9_shader_runner(r); @@ -343,6 +343,9 @@ static bool d3d9_runner_draw(struct shader_runner *r, unsigned int i, j; HRESULT hr; + if (instance_count > 1) + fatal_error("Unhandled instance count %u.\n", instance_count); + if (!(vs_code = compile_shader(runner, runner->r.vs_source, "vs"))) return false; diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 632ba5cc..2649dc55 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -974,7 +974,7 @@ static void gl_runner_clear(struct shader_runner *r, struct resource *res, const } static bool gl_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY topology, unsigned int vertex_count, unsigned int instance_count) { struct vkd3d_shader_signature vs_input_signature; unsigned int attribute_idx, rt_count, i, j; @@ -1159,7 +1159,7 @@ static bool gl_runner_draw(struct shader_runner *r, glDisableVertexAttribArray(attribute_idx); } - glDrawArrays(get_topology_gl(topology), 0, vertex_count); + glDrawArraysInstanced(get_topology_gl(topology), 0, vertex_count, instance_count); for (i = 0; i < runner->r.sampler_count; ++i) { diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 68a71c01..8c48c107 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1293,7 +1293,7 @@ static void vulkan_runner_clear(struct shader_runner *r, struct resource *res, c } static bool vulkan_runner_draw(struct shader_runner *r, - D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) + D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count, unsigned int instance_count) { struct vulkan_shader_runner *runner = vulkan_shader_runner(r); @@ -1330,7 +1330,7 @@ static bool vulkan_runner_draw(struct shader_runner *r, bind_resources(runner, VK_PIPELINE_BIND_POINT_GRAPHICS, set_layout, pipeline_layout); - VK_CALL(vkCmdDraw(cmd_buffer, vertex_count, 1, 0, 0)); + VK_CALL(vkCmdDraw(cmd_buffer, vertex_count, instance_count, 0, 0)); VK_CALL(vkCmdEndRenderPass(cmd_buffer)); end_command_buffer(runner);

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle SV_InstanceId.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: eef0f7c29ea150fe04e3e392af689df5f9555889 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eef0f7c29ea150fe04e3e392af689… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 13:01:41 2024 +1000 vkd3d-shader/dxil: Handle SV_InstanceId. --- libs/vkd3d-shader/dxil.c | 1 + tests/hlsl/instance-id.shader_test | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 6453eba3..ca73d5e9 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -8173,6 +8173,7 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = { [SEMANTIC_KIND_ARBITRARY] = VKD3D_SHADER_SV_NONE, [SEMANTIC_KIND_VERTEXID] = VKD3D_SHADER_SV_VERTEX_ID, + [SEMANTIC_KIND_INSTANCEID] = VKD3D_SHADER_SV_INSTANCE_ID, [SEMANTIC_KIND_POSITION] = VKD3D_SHADER_SV_POSITION, [SEMANTIC_KIND_ISFRONTFACE] = VKD3D_SHADER_SV_IS_FRONT_FACE, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, diff --git a/tests/hlsl/instance-id.shader_test b/tests/hlsl/instance-id.shader_test index b0465670..fd0e7e8b 100644 --- a/tests/hlsl/instance-id.shader_test +++ b/tests/hlsl/instance-id.shader_test @@ -42,7 +42,7 @@ float4 main(vs_out i) : SV_Target } [test] -todo(sm>=6 | glsl) draw triangle list 3 4 +todo(glsl) draw triangle list 3 4 probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25) probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5) probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75)

1 0

Francisco Casas : tests: Test x + 0 and x * 1 indentities.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: c43c900a300b0c3acf619bceeecac68b72414b9e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c43c900a300b0c3acf619bceeecac… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 23 16:35:50 2024 -0400 tests: Test x + 0 and x * 1 indentities. --- tests/hlsl/arithmetic-float-uniform.shader_test | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/hlsl/arithmetic-float-uniform.shader_test b/tests/hlsl/arithmetic-float-uniform.shader_test index a49d3f00..0797b237 100644 --- a/tests/hlsl/arithmetic-float-uniform.shader_test +++ b/tests/hlsl/arithmetic-float-uniform.shader_test @@ -187,3 +187,21 @@ uniform 4 double2 1.625 -5.0 uniform 8 double2 1.00000007 -1.0 todo(sm<6) draw quad probe all rgba (2.62500024, 209.5, 0.0, 0.0) + + +% Test result when instructions might be removed because they are identities such as (+0) or (*1). +[pixel shader] +float4 a; + +float4 main() : sv_target +{ + float4 zero = {0, 0, 0, 0}; + float4 one = {1, 1, 1, 1}; + + return a + zero + a * one + zero * one; +} + +[test] +uniform 0 float4 0.2 0.3 9.1 3.2 +todo(glsl) draw quad +probe all rgba (0.4, 0.6, 18.2, 6.4)

1 0

Francisco Casas : vkd3d-shader/hlsl: Fold x + 0 identities.
by Alexandre Julliard 30 Apr '24

30 Apr '24

Module: vkd3d Branch: master Commit: b14f935d0fbefb708a2f32b3be6c4099f28e2eee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b14f935d0fbefb708a2f32b3be6c4… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 19 12:57:38 2024 -0400 vkd3d-shader/hlsl: Fold x + 0 identities. --- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/hlsl_constant_ops.c | 91 +++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a1e3aacd..ec3f5826 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1422,6 +1422,7 @@ struct hlsl_reg hlsl_reg_from_deref(struct hlsl_ctx *ctx, const struct hlsl_dere bool hlsl_copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *block); bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); +bool hlsl_fold_constant_identities(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); bool hlsl_fold_constant_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context); bool hlsl_transform_ir(struct hlsl_ctx *ctx, bool (*func)(struct hlsl_ctx *ctx, struct hlsl_ir_node *, void *), struct hlsl_block *block, void *context); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index a6d6b336..94acb70f 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5427,6 +5427,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry do { progress = hlsl_transform_ir(ctx, hlsl_fold_constant_exprs, body, NULL); + progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_identities, body, NULL); progress |= hlsl_transform_ir(ctx, hlsl_fold_constant_swizzles, body, NULL); progress |= hlsl_copy_propagation_execute(ctx, body); progress |= hlsl_transform_ir(ctx, fold_swizzle_chains, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 4cea98e9..526ce88b 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -1396,6 +1396,97 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, return success; } +static bool constant_is_zero(struct hlsl_ir_constant *const_arg) +{ + struct hlsl_type *data_type = const_arg->node.data_type; + unsigned int k; + + for (k = 0; k < data_type->dimx; ++k) + { + switch (data_type->base_type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (const_arg->value.u[k].f != 0.0f) + return false; + break; + + case HLSL_TYPE_DOUBLE: + if (const_arg->value.u[k].d != 0.0) + return false; + break; + + case HLSL_TYPE_UINT: + case HLSL_TYPE_INT: + case HLSL_TYPE_BOOL: + if (const_arg->value.u[k].u != 0) + return false; + break; + + default: + return false; + } + } + return true; +} + +bool hlsl_fold_constant_identities(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_ir_constant *const_arg = NULL; + struct hlsl_ir_node *mut_arg = NULL; + struct hlsl_ir_node *res_node; + struct hlsl_ir_expr *expr; + unsigned int i; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + + if (instr->data_type->class > HLSL_CLASS_VECTOR) + return false; + + /* Verify that the expression has two operands. */ + for (i = 0; i < ARRAY_SIZE(expr->operands); ++i) + { + if (!!expr->operands[i].node != (i < 2)) + return false; + } + + if (expr->operands[0].node->type == HLSL_IR_CONSTANT) + { + const_arg = hlsl_ir_constant(expr->operands[0].node); + mut_arg = expr->operands[1].node; + } + else if (expr->operands[1].node->type == HLSL_IR_CONSTANT) + { + mut_arg = expr->operands[0].node; + const_arg = hlsl_ir_constant(expr->operands[1].node); + } + else + { + return false; + } + + res_node = NULL; + switch (expr->op) + { + case HLSL_OP2_ADD: + if (constant_is_zero(const_arg)) + res_node = mut_arg; + break; + + default: + break; + } + + if (res_node) + { + hlsl_replace_node(&expr->node, res_node); + return true; + } + return false; +} + bool hlsl_fold_constant_swizzles(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_constant_value value;

1 0