February 2024 - Wine-Commits

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_texture_load().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 76455580e24908172864f9ff7627874d101b08ac URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/76455580e24908172864f9ff76278… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:13:04 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_texture_load(). --- 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 b8241345..b0dcec2d 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4266,7 +4266,8 @@ static void sm6_parser_emit_dx_texture_load(struct sm6_parser *sm6, enum dx_intr for (i = 0; i < VKD3D_VEC4_SIZE; ++i) ins->resource_data_type[i] = resource->u.handle.d->resource_data_type; - src_params = instruction_src_params_alloc(ins, 2 + is_multisample, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 2 + is_multisample, sm6))) + return; src_param_init_vector_from_reg(&src_params[0], &coord); src_param_init_vector_from_reg(&src_params[1], &resource->u.handle.reg); if (is_multisample)

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_extractval().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 04a93401641bfd3d2766d66090c4ab549c8d436e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/04a93401641bfd3d2766d66090c4a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:13:45 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_extractval(). --- 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 a175875b..fdaabc92 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4962,7 +4962,8 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param->reg = src->u.reg; src_param_init_scalar(src_param, elem_idx);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_cast().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: cddb696499859e8c8d2bb878408d9f49c2bff5a0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cddb696499859e8c8d2bb878408d9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:13:17 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_cast(). --- 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 b0dcec2d..ac8c0ac9 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -4766,7 +4766,8 @@ static void sm6_parser_emit_cast(struct sm6_parser *sm6, const struct dxil_recor return; } - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_from_value(src_param, value); instruction_dst_param_init_ssa_scalar(ins, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_binop().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 217eb06f37eb5fce82b9f80ef8b72c451e28a780 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/217eb06f37eb5fce82b9f80ef8b72… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:10:12 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_binop(). --- 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 32cb5bd4..03f71e0f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3529,7 +3529,8 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco "Ignoring flags %#"PRIx64" for a binary operation.", flags); } - src_params = instruction_src_params_alloc(ins, 2, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + return; src_param_init_from_value(&src_params[0], a); src_param_init_from_value(&src_params[1], b); if (code == BINOP_SUB)

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_load_input().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 6e3e200e96cadb8eb0cf00a473332ba0a4b2ecd8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e3e200e96cadb8eb0cf00a473332… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:11:55 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_load_input(). --- 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 afe3280d..e57bd1ea 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3967,7 +3967,8 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin } e = &signature->elements[row_index]; - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param->reg = sm6->input_params[row_index].reg; src_param_init_scalar(src_param, column_index); if (e->register_count > 1)

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_tertiary().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: eb1bfaa82104528ce6ada01386c54538635baed8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb1bfaa82104528ce6ada01386c54… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:11:36 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_tertiary(). --- 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 39d7fcaf..afe3280d 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3935,7 +3935,8 @@ static void sm6_parser_emit_dx_tertiary(struct sm6_parser *sm6, enum dx_intrinsi unsigned int i; vsir_instruction_init(ins, &sm6->p.location, sm6_dx_map_tertiary_op(op)); - src_params = instruction_src_params_alloc(ins, 3, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 3, sm6))) + return; for (i = 0; i < 3; ++i) src_param_init_from_value(&src_params[i], operands[i]);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_cbuffer_load().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 1a2de25273a0a0611594483cf105d7039beb0749 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1a2de25273a0a0611594483cf105d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:11:16 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_cbuffer_load(). --- 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 bef8194e..39d7fcaf 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3838,7 +3838,8 @@ static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, enum dx_intr vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_vector_from_reg(src_param, &buffer->u.handle.reg); register_index_address_init(&src_param->reg.idx[2], operands[1], sm6); assert(src_param->reg.idx_count == 3);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_unary().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 83e6ee4b3d73127bbdc75dfd98b8e54f3742c125 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/83e6ee4b3d73127bbdc75dfd98b8e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:10:37 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_unary(). --- 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 03f71e0f..b9f7cfae 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3780,7 +3780,8 @@ static void sm6_parser_emit_dx_unary(struct sm6_parser *sm6, enum dx_intrinsic_o struct vkd3d_shader_src_param *src_param; vsir_instruction_init(ins, &sm6->p.location, map_dx_unary_op(op)); - src_param = instruction_src_params_alloc(ins, 1, sm6); + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; src_param_init_from_value(src_param, operands[0]); instruction_dst_param_init_ssa_scalar(ins, sm6);

1 0

Conor McCarthy : vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_binary().
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 0a23c81196fc3b2339ae27ece551a16f857f0888 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a23c81196fc3b2339ae27ece551a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Feb 14 00:10:56 2024 +1000 vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_binary(). --- 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 b9f7cfae..bef8194e 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3815,7 +3815,8 @@ static void sm6_parser_emit_dx_binary(struct sm6_parser *sm6, enum dx_intrinsic_ struct vkd3d_shader_src_param *src_params; vsir_instruction_init(ins, &sm6->p.location, map_dx_binary_op(op, operands[0]->type)); - src_params = instruction_src_params_alloc(ins, 2, sm6); + if (!(src_params = instruction_src_params_alloc(ins, 2, sm6))) + return; src_param_init_from_value(&src_params[0], operands[0]); src_param_init_from_value(&src_params[1], operands[1]);

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic SampleGrad.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: vkd3d Branch: master Commit: 5a76cedf8744f65731d71b72effaa82754ffc57d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a76cedf8744f65731d71b72effaa… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Feb 12 17:05:34 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic SampleGrad. --- libs/vkd3d-shader/dxil.c | 37 ++++++++++++++++++++++++++++++++----- tests/hlsl/sample-grad.shader_test | 6 +++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0f17f0e1..32cb5bd4 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -33,7 +33,7 @@ static const uint64_t ALLOCA_FLAG_IN_ALLOCA = 0x20; static const uint64_t ALLOCA_FLAG_EXPLICIT_TYPE = 0x40; static const uint64_t ALLOCA_ALIGNMENT_MASK = ALLOCA_FLAG_IN_ALLOCA - 1; static const unsigned int SHADER_DESCRIPTOR_TYPE_COUNT = 4; -static const size_t MAX_IR_INSTRUCTIONS_PER_DXIL_INSTRUCTION = 5; +static const size_t MAX_IR_INSTRUCTIONS_PER_DXIL_INSTRUCTION = 11; static const unsigned int dx_max_thread_group_size[3] = {1024, 1024, 64}; @@ -377,6 +377,7 @@ enum dx_intrinsic_opcode DX_CREATE_HANDLE = 57, DX_CBUFFER_LOAD_LEGACY = 59, DX_SAMPLE = 60, + DX_SAMPLE_GRAD = 63, DX_TEXTURE_LOAD = 66, DX_TEXTURE_STORE = 67, DX_BUFFER_LOAD = 68, @@ -4070,11 +4071,11 @@ static void instruction_set_texel_offset(struct vkd3d_shader_instruction *ins, static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { + struct vkd3d_shader_register coord, ddx, ddy; const struct sm6_value *resource, *sampler; struct vkd3d_shader_src_param *src_params; struct vkd3d_shader_instruction *ins; - struct vkd3d_shader_register coord; - const unsigned int clamp_idx = 9; + unsigned int clamp_idx; resource = operands[0]; sampler = operands[1]; @@ -4087,9 +4088,34 @@ static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_ if (!sm6_parser_emit_coordinate_construct(sm6, &operands[2], VKD3D_VEC4_SIZE, NULL, state, &coord)) return; + if (op == DX_SAMPLE_GRAD) + { + if (!sm6_parser_emit_coordinate_construct(sm6, &operands[9], 3, NULL, state, &ddx)) + return; + if (!sm6_parser_emit_coordinate_construct(sm6, &operands[12], 3, NULL, state, &ddy)) + return; + } + ins = state->ins; - instruction_init_with_resource(ins, VKD3DSIH_SAMPLE, resource, sm6); - if (!(src_params = instruction_src_params_alloc(ins, 3, sm6))) + switch (op) + { + case DX_SAMPLE: + instruction_init_with_resource(ins, VKD3DSIH_SAMPLE, resource, sm6); + src_params = instruction_src_params_alloc(ins, 3, sm6); + clamp_idx = 9; + break; + case DX_SAMPLE_GRAD: + instruction_init_with_resource(ins, VKD3DSIH_SAMPLE_GRAD, resource, sm6); + src_params = instruction_src_params_alloc(ins, 5, sm6); + src_param_init_vector_from_reg(&src_params[3], &ddx); + src_param_init_vector_from_reg(&src_params[4], &ddy); + clamp_idx = 15; + break; + default: + vkd3d_unreachable(); + } + + if (!src_params) return; if (!sm6_value_is_undef(operands[clamp_idx])) @@ -4358,6 +4384,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_ROUND_Z ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SAMPLE ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, + [DX_SAMPLE_GRAD ] = {"o", "HHffffiiifffffff", sm6_parser_emit_dx_sample}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_SPLIT_DOUBLE ] = {"S", "d", sm6_parser_emit_dx_split_double}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/sample-grad.shader_test b/tests/hlsl/sample-grad.shader_test index 298037a7..c37da299 100644 --- a/tests/hlsl/sample-grad.shader_test +++ b/tests/hlsl/sample-grad.shader_test @@ -26,11 +26,11 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm>=6) draw quad +draw quad probe all rgba (1.0, 0.0, 1.0, 0.0) uniform 0 float4 1.0 1.0 1.0 1.0 -todo(sm>=6) draw quad +draw quad probe all rgba (0.0, 0.0, 1.0, 0.0) uniform 0 float4 2.0 2.0 2.0 2.0 -todo(sm>=6) draw quad +draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0