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

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic QuadReadLaneAt.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: 0b8b5b2d0f76bb226a6e09fd75f07b52d32b4a71 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0b8b5b2d0f76bb226a6e09fd75f07… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 22:31:40 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic QuadReadLaneAt. --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 895ffd31..e784e42c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -257,6 +257,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_QUAD_READ_ACROSS_D ] = "quad_read_across_d", [VKD3DSIH_QUAD_READ_ACROSS_X ] = "quad_read_across_x", [VKD3DSIH_QUAD_READ_ACROSS_Y ] = "quad_read_across_y", + [VKD3DSIH_QUAD_READ_LANE_AT ] = "quad_read_lane_at", [VKD3DSIH_RCP ] = "rcp", [VKD3DSIH_REP ] = "rep", [VKD3DSIH_RESINFO ] = "resinfo", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index a055f795..2176debc 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -458,6 +458,7 @@ enum dx_intrinsic_opcode DX_WAVE_ACTIVE_OP = 119, DX_WAVE_ACTIVE_BIT = 120, DX_WAVE_PREFIX_OP = 121, + DX_QUAD_READ_LANE_AT = 122, DX_QUAD_OP = 123, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -4627,6 +4628,8 @@ static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op, co return VKD3DSIH_IMAX; case DX_IMIN: return VKD3DSIH_IMIN; + case DX_QUAD_READ_LANE_AT: + return VKD3DSIH_QUAD_READ_LANE_AT; case DX_UMAX: return VKD3DSIH_UMAX; case DX_UMIN: @@ -6279,6 +6282,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_OUTPUT_CONTROL_POINT_ID ] = {"i", "", sm6_parser_emit_dx_output_control_point_id}, [DX_PRIMITIVE_ID ] = {"i", "", sm6_parser_emit_dx_primitive_id}, [DX_QUAD_OP ] = {"n", "Rc", sm6_parser_emit_dx_quad_op}, + [DX_QUAD_READ_LANE_AT ] = {"n", "Ri", sm6_parser_emit_dx_binary}, [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_RAW_BUFFER_STORE ] = {"v", "Hiioooocc", sm6_parser_emit_dx_raw_buffer_store}, [DX_ROUND_NE ] = {"g", "R", sm6_parser_emit_dx_unary}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index d3370744..79cc6faa 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -458,6 +458,7 @@ enum vkd3d_shader_opcode VKD3DSIH_QUAD_READ_ACROSS_D, VKD3DSIH_QUAD_READ_ACROSS_X, VKD3DSIH_QUAD_READ_ACROSS_Y, + VKD3DSIH_QUAD_READ_LANE_AT, VKD3DSIH_RCP, VKD3DSIH_REP, VKD3DSIH_RESINFO,

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the QUAD_READ_LANE_AT instruction.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: 9b070edf019885fc75f48d2f56f6d29541d8043e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b070edf019885fc75f48d2f56f6d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 22:35:28 2024 +1000 vkd3d-shader/spirv: Implement the QUAD_READ_LANE_AT instruction. --- libs/vkd3d-shader/spirv.c | 36 +++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-float.shader_test | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2be3a3e1..a5ace95e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1760,6 +1760,14 @@ static uint32_t vkd3d_spirv_build_op_group_nonuniform_quad_swap(struct vkd3d_spi vkd3d_spirv_get_op_scope_subgroup(builder), val_id, op_id); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_quad_broadcast(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t val_id, uint32_t index_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformQuad); + return vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, SpvOpGroupNonUniformQuadBroadcast, result_type, + vkd3d_spirv_get_op_scope_subgroup(builder), val_id, index_id); +} + static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t val_id) { @@ -9847,6 +9855,31 @@ static void spirv_compiler_emit_quad_read_across(struct spirv_compiler *compiler spirv_compiler_emit_store_dst(compiler, dst, val_id); } +static void spirv_compiler_emit_quad_read_lane_at(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, val_id, lane_id; + + if (!register_is_constant_or_undef(&src[1].reg)) + { + FIXME("Unsupported non-constant quad read lane index.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_NOT_IMPLEMENTED, + "Non-constant quad read lane indices are not supported."); + return; + } + + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, dst->reg.data_type, + vsir_write_mask_component_count(dst->write_mask)); + val_id = spirv_compiler_emit_load_src(compiler, &src[0], dst->write_mask); + lane_id = spirv_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + val_id = vkd3d_spirv_build_op_group_nonuniform_quad_broadcast(builder, type_id, val_id, lane_id); + + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode opcode) { switch (opcode) @@ -10382,6 +10415,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_QUAD_READ_ACROSS_Y: spirv_compiler_emit_quad_read_across(compiler, instruction); break; + case VKD3DSIH_QUAD_READ_LANE_AT: + spirv_compiler_emit_quad_read_lane_at(compiler, instruction); + break; case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: case VKD3DSIH_WAVE_ALL_TRUE: case VKD3DSIH_WAVE_ANY_TRUE: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index 1cee8b5d..e6a916cb 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -273,7 +273,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (0.75, 1.0, 0.5, 0.25) probe uav 1 (1) rgba (0.75, 1.0, 0.5, 0.25) probe uav 1 (2) rgba (0.75, 1.0, 0.5, 0.25) @@ -385,7 +385,7 @@ float4 main(float4 pos : SV_Position) : SV_Target } [test] -todo draw quad +draw quad probe uav 1 (0) rgba (0.5, 0.25, 1.0, 0.75) probe uav 1 (1) rgba (0.5, 0.25, 1.0, 0.75) probe uav 1 (2) rgba (0.5, 0.25, 1.0, 0.75)

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the QUAD_READ_ACROSS_* instructions.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: c298493e4f7447bdc23752a07c49e34b83f5db65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c298493e4f7447bdc23752a07c49e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 8 13:44:51 2024 +1000 vkd3d-shader/spirv: Implement the QUAD_READ_ACROSS_* instructions. --- libs/vkd3d-shader/spirv.c | 47 +++++++++++++++++++++++++++++++++++ tests/hlsl/wave-ops-float.shader_test | 10 ++++---- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 01d5bc3d..2be3a3e1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1752,6 +1752,14 @@ static uint32_t vkd3d_spirv_get_op_scope_subgroup(struct vkd3d_spirv_builder *bu return vkd3d_spirv_build_once(builder, &builder->scope_subgroup_id, vkd3d_spirv_build_op_scope_subgroup); } +static uint32_t vkd3d_spirv_build_op_group_nonuniform_quad_swap(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t val_id, uint32_t op_id) +{ + vkd3d_spirv_enable_capability(builder, SpvCapabilityGroupNonUniformQuad); + return vkd3d_spirv_build_op_tr3(builder, &builder->function_stream, SpvOpGroupNonUniformQuadSwap, result_type, + vkd3d_spirv_get_op_scope_subgroup(builder), val_id, op_id); +} + static uint32_t vkd3d_spirv_build_op_group_nonuniform_ballot(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t val_id) { @@ -9805,6 +9813,40 @@ static void spirv_compiler_emit_cut_stream(struct spirv_compiler *compiler, vkd3d_spirv_build_op_end_primitive(builder); } +static uint32_t map_quad_read_across_direction(enum vkd3d_shader_opcode opcode) +{ + switch (opcode) + { + case VKD3DSIH_QUAD_READ_ACROSS_X: + return 0; + case VKD3DSIH_QUAD_READ_ACROSS_Y: + return 1; + case VKD3DSIH_QUAD_READ_ACROSS_D: + return 2; + default: + vkd3d_unreachable(); + } +} + +static void spirv_compiler_emit_quad_read_across(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t type_id, direction_type_id, direction_id, val_id; + + type_id = vkd3d_spirv_get_type_id_for_data_type(builder, dst->reg.data_type, + vsir_write_mask_component_count(dst->write_mask)); + direction_type_id = vkd3d_spirv_get_type_id_for_data_type(builder, VKD3D_DATA_UINT, 1); + val_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + direction_id = map_quad_read_across_direction(instruction->opcode); + direction_id = vkd3d_spirv_get_op_constant(builder, direction_type_id, direction_id); + val_id = vkd3d_spirv_build_op_group_nonuniform_quad_swap(builder, type_id, val_id, direction_id); + + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + static SpvOp map_wave_bool_op(enum vkd3d_shader_opcode opcode) { switch (opcode) @@ -10335,6 +10377,11 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_CUT_STREAM: spirv_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_QUAD_READ_ACROSS_D: + case VKD3DSIH_QUAD_READ_ACROSS_X: + case VKD3DSIH_QUAD_READ_ACROSS_Y: + spirv_compiler_emit_quad_read_across(compiler, instruction); + break; case VKD3DSIH_WAVE_ACTIVE_ALL_EQUAL: case VKD3DSIH_WAVE_ALL_TRUE: case VKD3DSIH_WAVE_ANY_TRUE: diff --git a/tests/hlsl/wave-ops-float.shader_test b/tests/hlsl/wave-ops-float.shader_test index b54f5ac1..1cee8b5d 100644 --- a/tests/hlsl/wave-ops-float.shader_test +++ b/tests/hlsl/wave-ops-float.shader_test @@ -252,7 +252,7 @@ void main(uint id : SV_GroupIndex) } [test] -todo dispatch 4 1 1 +dispatch 4 1 1 probe uav 1 (0) rgba (0.5, 0.25, 1.0, 0.75) probe uav 1 (1) rgba (0.25, 0.5, 0.75, 1.0) probe uav 1 (2) rgba (1.0, 0.75, 0.25, 0.5) @@ -293,7 +293,7 @@ float4 main(float4 pos : SV_Position) : SV_Target } [test] -todo draw quad +draw quad probe rtv 0 (0, 0) rgba (0.25, 0.5, 0.75, 1.0) probe rtv 0 (1, 0) rgba (0.5, 0.25, 1.0, 0.75) probe rtv 0 (0, 1) rgba (0.75, 1.0, 0.5, 0.25) @@ -317,7 +317,7 @@ float4 main(float4 pos : SV_Position) : SV_Target } [test] -todo draw quad +draw quad probe uav 1 (0) rgba (0.75, 1.0, 0.5, 0.25) probe uav 1 (1) rgba (1.0, 0.75, 0.25, 0.5) probe uav 1 (2) rgba (0.25, 0.5, 0.75, 1.0) @@ -337,7 +337,7 @@ float4 main(float4 pos : SV_Position) : SV_Target } [test] -todo draw quad +draw quad probe uav 1 (0) rgba (1.0, 0.75, 0.25, 0.5) probe uav 1 (1) rgba (0.75, 1.0, 0.5, 0.25) probe uav 1 (2) rgba (0.5, 0.25, 1.0, 0.75) @@ -360,7 +360,7 @@ float4 main(float4 pos : SV_Position) : SV_Target } [test] -todo draw quad +draw quad probe rtv 0 (0, 0) rgba (1.0, 0.0, 0.0, 1.0) probe rtv 0 (1, 0) rgba (1.0, 0.0, 0.0, 1.0) probe rtv 0 (0, 1) rgba (0.75, 1.0, 0.5, 0.25)

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic QuadOp.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: 8a15642f45a2ccaefd1ca8c2fd7b05d4cebbe922 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8a15642f45a2ccaefd1ca8c2fd7b0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Apr 23 22:16:51 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic QuadOp. --- libs/vkd3d-shader/d3d_asm.c | 3 ++ libs/vkd3d-shader/dxil.c | 50 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++ 3 files changed, 56 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 4747b2bb..895ffd31 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -254,6 +254,9 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_PHASE ] = "phase", [VKD3DSIH_PHI ] = "phi", [VKD3DSIH_POW ] = "pow", + [VKD3DSIH_QUAD_READ_ACROSS_D ] = "quad_read_across_d", + [VKD3DSIH_QUAD_READ_ACROSS_X ] = "quad_read_across_x", + [VKD3DSIH_QUAD_READ_ACROSS_Y ] = "quad_read_across_y", [VKD3DSIH_RCP ] = "rcp", [VKD3DSIH_REP ] = "rep", [VKD3DSIH_RESINFO ] = "resinfo", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c08654ae..a055f795 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -458,6 +458,7 @@ enum dx_intrinsic_opcode DX_WAVE_ACTIVE_OP = 119, DX_WAVE_ACTIVE_BIT = 120, DX_WAVE_PREFIX_OP = 121, + DX_QUAD_OP = 123, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_WAVE_ALL_BIT_COUNT = 135, @@ -576,6 +577,13 @@ enum dxil_wave_op_kind WAVE_OP_MAX = 3, }; +enum dxil_quad_op_kind +{ + QUAD_READ_ACROSS_X = 0, + QUAD_READ_ACROSS_Y = 1, + QUAD_READ_ACROSS_D = 2, +}; + struct sm6_pointer_info { const struct sm6_type *type; @@ -5370,6 +5378,47 @@ static void sm6_parser_emit_dx_primitive_id(struct sm6_parser *sm6, enum dx_intr sm6_parser_emit_dx_input_register_mov(sm6, state->ins, VKD3DSPR_PRIMID, VKD3D_DATA_UINT); } +static enum vkd3d_shader_opcode dx_map_quad_op(enum dxil_quad_op_kind op) +{ + switch (op) + { + case QUAD_READ_ACROSS_X: + return VKD3DSIH_QUAD_READ_ACROSS_X; + case QUAD_READ_ACROSS_Y: + return VKD3DSIH_QUAD_READ_ACROSS_Y; + case QUAD_READ_ACROSS_D: + return VKD3DSIH_QUAD_READ_ACROSS_D; + default: + return VKD3DSIH_INVALID; + } +} + +static void sm6_parser_emit_dx_quad_op(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + enum vkd3d_shader_opcode opcode; + enum dxil_quad_op_kind quad_op; + + quad_op = sm6_value_get_constant_uint(operands[1]); + if ((opcode = dx_map_quad_op(quad_op)) == VKD3DSIH_INVALID) + { + FIXME("Unhandled quad op kind %u.\n", quad_op); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC, + "Quad op kind %u is unhandled.", quad_op); + return; + } + + vsir_instruction_init(ins, &sm6->p.location, opcode); + + 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); +} + static void sm6_parser_emit_dx_raw_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -6229,6 +6278,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_MAKE_DOUBLE ] = {"d", "ii", sm6_parser_emit_dx_make_double}, [DX_OUTPUT_CONTROL_POINT_ID ] = {"i", "", sm6_parser_emit_dx_output_control_point_id}, [DX_PRIMITIVE_ID ] = {"i", "", sm6_parser_emit_dx_primitive_id}, + [DX_QUAD_OP ] = {"n", "Rc", sm6_parser_emit_dx_quad_op}, [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_RAW_BUFFER_STORE ] = {"v", "Hiioooocc", sm6_parser_emit_dx_raw_buffer_store}, [DX_ROUND_NE ] = {"g", "R", sm6_parser_emit_dx_unary}, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index efd3b59a..d3370744 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -455,6 +455,9 @@ enum vkd3d_shader_opcode VKD3DSIH_PHASE, VKD3DSIH_PHI, VKD3DSIH_POW, + VKD3DSIH_QUAD_READ_ACROSS_D, + VKD3DSIH_QUAD_READ_ACROSS_X, + VKD3DSIH_QUAD_READ_ACROSS_Y, VKD3DSIH_RCP, VKD3DSIH_REP, VKD3DSIH_RESINFO,

1 0

Francisco Casas : vkd3d-shader/hlsl: Reorder default values for matrices for SM4.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: f5bfa728eb82cbf0d3540251b200c43b6184b74f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f5bfa728eb82cbf0d3540251b200c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 12 17:22:45 2024 -0400 vkd3d-shader/hlsl: Reorder default values for matrices for SM4. Default value initializers behave differently than regular initializers for matrices on SM4 profiles. While regular initializers assign the rhs elements in reading-order (completing one row at the time), default initializers assing the rhs elements in Chinese reading-order (completing one column at the time). So after lowering a default value to a constant, the index of the component to which this default value is stored is computed to meet this expectation. This can be done because the default values. For reference, compiling this shader: row_major int2x3 m = {1, 2, 3, 4, 5, 6}; float4 main() : sv_target { return float4(m[0][0], 99, 99, 99); } gives the following buffer definition: // cbuffer $Globals // { // // row_major int2x3 m; // Offset: 0 Size: 28 // = 0x00000001 0x00000003 0x00000005 0x00000000 // 0x00000002 0x00000004 0x00000006 // // } Given that the matrix is column-major, m's default value is actually {{1, 3, 5}, {2, 4, 6}}, unlike the {{1, 2, 3}, {4, 5, 6}} one would expect in a regular initializer. SM1 profiles assign the elements in regular reading order. --- libs/vkd3d-shader/hlsl.y | 48 +++++++++++++++++++++++++++++++++++++++++++++++- tests/hlsl_d3d12.c | 2 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 66fed7ad..d2fc43b6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2079,6 +2079,50 @@ static bool add_increment(struct hlsl_ctx *ctx, struct hlsl_block *block, bool d return true; } +/* For some reason, for matrices, values from default value initializers end up in different + * components than from regular initializers. Default value initializers fill the matrix in + * vertical reading order (left-to-right top-to-bottom) instead of regular reading order + * (top-to-bottom left-to-right), so they have to be adjusted. */ +static unsigned int get_component_index_from_default_initializer_index(struct hlsl_ctx *ctx, + struct hlsl_type *type, unsigned int index) +{ + unsigned int element_comp_count, element, x, y, i; + unsigned int base = 0; + + if (ctx->profile->major_version < 4) + return index; + + switch (type->class) + { + case HLSL_CLASS_MATRIX: + x = index / type->dimy; + y = index % type->dimy; + return y * type->dimx + x; + + case HLSL_CLASS_ARRAY: + element_comp_count = hlsl_type_component_count(type->e.array.type); + element = index / element_comp_count; + base = element * element_comp_count; + return base + get_component_index_from_default_initializer_index(ctx, type->e.array.type, index - base); + + case HLSL_CLASS_STRUCT: + for (i = 0; i < type->e.record.field_count; ++i) + { + struct hlsl_type *field_type = type->e.record.fields[i].type; + + element_comp_count = hlsl_type_component_count(field_type); + if (index - base < element_comp_count) + return base + get_component_index_from_default_initializer_index(ctx, field_type, index - base); + base += element_comp_count; + } + break; + + default: + return index; + } + vkd3d_unreachable(); +} + static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *instrs, struct hlsl_ir_var *dst, unsigned int *store_index, struct hlsl_ir_node *src) { @@ -2102,12 +2146,14 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i if (dst->default_values) { struct hlsl_default_value default_value = {0}; + unsigned int dst_index; if (!hlsl_clone_block(ctx, &block, instrs)) return; default_value.value = evaluate_static_expression(ctx, &block, dst_comp_type, &src->loc); - dst->default_values[*store_index] = default_value; + dst_index = get_component_index_from_default_initializer_index(ctx, dst->data_type, *store_index); + dst->default_values[dst_index] = default_value; hlsl_block_cleanup(&block); } diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 1292e100..b579f305 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1872,7 +1872,7 @@ static void test_default_values_reflection(void) unsigned int var_val = *((unsigned int *)var_desc.DefaultValue + k); unsigned int expect_val = *((unsigned int *)expect->var_desc.DefaultValue + k); - todo_if(var_val != expect_val) ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", + ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", expect_val, var_val, 4 * k); } }

1 0

Francisco Casas : vkd3d-shader/hlsl: Fix numeric register offset for matrix components.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: ab01fedc5d9311ae0d0f95fdc407922aa99c8ce0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ab01fedc5d9311ae0d0f95fdc4079… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 11 16:55:06 2024 -0400 vkd3d-shader/hlsl: Fix numeric register offset for matrix components. --- libs/vkd3d-shader/hlsl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 998d3d2a..d4180675 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -558,12 +558,14 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty switch (type->class) { - case HLSL_CLASS_SCALAR: case HLSL_CLASS_VECTOR: - case HLSL_CLASS_MATRIX: offset[HLSL_REGSET_NUMERIC] += idx; break; + case HLSL_CLASS_MATRIX: + offset[HLSL_REGSET_NUMERIC] += 4 * idx; + break; + case HLSL_CLASS_STRUCT: for (r = 0; r <= HLSL_REGSET_LAST; ++r) offset[r] += type->e.record.fields[idx].reg_offset[r]; @@ -594,6 +596,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty case HLSL_CLASS_PASS: case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_VOID: + case HLSL_CLASS_SCALAR: vkd3d_unreachable(); } type = next_type;

1 0

Francisco Casas : tests: Test matrix default value initializers.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: ade3daa31110bb1d605bc8b4a06bd499a511969e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ade3daa31110bb1d605bc8b4a06bd… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 12 19:24:47 2024 -0400 tests: Test matrix default value initializers. --- tests/hlsl/default-values.shader_test | 74 +++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/tests/hlsl/default-values.shader_test b/tests/hlsl/default-values.shader_test index 0339fbd6..728fa5a6 100644 --- a/tests/hlsl/default-values.shader_test +++ b/tests/hlsl/default-values.shader_test @@ -220,6 +220,80 @@ todo(glsl) draw quad probe all rgba (70, 80, 90, 100) +% In SM4, the values in the default values initializer of matrices end up in different components +% than for regular initializers. The values are assigned to the matrix components in Chinese +% reading order, i.e. the components of a whole column are assigned before the next column, unlike +% regular initializers where the components of each row are assigned before the next row. +[pixel shader] +int2x3 m = {1, 2, 3, 4, 5, 6}; +// int2x3 m; // Offset: 0 Size: 40 +// = 0x00000001 0x00000002 0x00000000 0x00000000 +// 0x00000003 0x00000004 0x00000000 0x00000000 +// 0x00000005 0x00000006 + +float4 main() : sv_target +{ + return m[0][0]; +} + + +% The same happens for numeric constructors. +[pixel shader] +int2x3 m = int2x3(1, 2, 3, 4, 5, 6); +// int2x3 m; // Offset: 0 Size: 40 +// = 0x00000001 0x00000002 0x00000000 0x00000000 +// 0x00000003 0x00000004 0x00000000 0x00000000 +// 0x00000005 0x00000006 + +float4 main() : sv_target +{ + return m[0][0]; +} + + +[pixel shader] +cbuffer buff +{ + row_major int2x3 m = {1, 2, 3, 4, 5, 6}; + // row_major int2x3 m; // Offset: 0 Size: 28 + // = 0x00000001 0x00000003 0x00000005 0x00000000 + // 0x00000002 0x00000004 0x00000006 +} + +float4 main() : sv_target +{ + return m[0][0]; +} + + +[pixel shader fail(sm>=6)] +struct +{ + float2 a[2]; + row_major int2x3 b; + float3 c[2]; +} apple = {100, 101, 110, 111, 1, 2, 3, 4, 5, 6, 200, 201, 202, 210, 211, 212}; +// struct +// { +// +// float2 a[2]; // Offset: 0 +// row_major int2x3 b; // Offset: 32 +// float3 c[2]; // Offset: 64 +// +// } apple; // Offset: 0 Size: 92 +// = 0x42c80000 0x42ca0000 0x00000000 0x00000000 +// 0x42dc0000 0x42de0000 0x00000000 0x00000000 +// 0x00000001 0x00000003 0x00000005 0x00000000 +// 0x00000002 0x00000004 0x00000006 0x00000000 +// 0x43480000 0x43490000 0x434a0000 0x00000000 +// 0x43520000 0x43530000 0x43540000 + +float4 main() : sv_target +{ + return float4(apple.c[0], 0); +} + + [require] shader model >= 5.0

1 0

Francisco Casas : vkd3d-shader/d3dbc: Write default values for SM1.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: affadf319c423f3f8e24a83bac3698e85edb861b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/affadf319c423f3f8e24a83bac369… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Apr 17 20:22:50 2024 -0400 vkd3d-shader/d3dbc: Write default values for SM1. --- libs/vkd3d-shader/d3dbc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 20c0e7db..197b73eb 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1743,9 +1743,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe put_u32(buffer, var->bind_count[r]); } put_u32(buffer, 0); /* type */ - put_u32(buffer, 0); /* FIXME: default value */ - if (var->default_values) - FIXME("Write SM1 default values.\n"); + put_u32(buffer, 0); /* default value */ } } @@ -1769,6 +1767,62 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe write_sm1_type(buffer, var->data_type, ctab_start); set_u32(buffer, var_offset + 3 * sizeof(uint32_t), var->data_type->bytecode_offset - ctab_start); + + if (var->default_values) + { + unsigned int reg_size = var->data_type->reg_size[HLSL_REGSET_NUMERIC]; + unsigned int comp_count = hlsl_type_component_count(var->data_type); + unsigned int default_value_offset; + unsigned int k; + + default_value_offset = bytecode_reserve_bytes(buffer, reg_size * sizeof(uint32_t)); + set_u32(buffer, var_offset + 4 * sizeof(uint32_t), default_value_offset - ctab_start); + + for (k = 0; k < comp_count; ++k) + { + struct hlsl_type *comp_type = hlsl_type_get_component_type(ctx, var->data_type, k); + unsigned int comp_offset; + enum hlsl_regset regset; + + comp_offset = hlsl_type_get_component_offset(ctx, var->data_type, k, &regset); + if (regset == HLSL_REGSET_NUMERIC) + { + union + { + uint32_t u; + float f; + } uni; + + switch (comp_type->e.numeric.type) + { + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &var->loc, "Write double default values."); + uni.u = 0; + break; + + case HLSL_TYPE_INT: + uni.f = var->default_values[k].value.i; + break; + + case HLSL_TYPE_UINT: + case HLSL_TYPE_BOOL: + uni.f = var->default_values[k].value.u; + break; + + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + uni.u = var->default_values[k].value.u; + break; + + default: + vkd3d_unreachable(); + } + + set_u32(buffer, default_value_offset + comp_offset * sizeof(uint32_t), uni.u); + } + } + } + ++uniform_count; } }

1 0

Francisco Casas : vkd3d-shader/tpf: Write default values for SM4.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: 253c9941556ff1bb9e3d8ee55d4941c3438de700 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/253c9941556ff1bb9e3d8ee55d494… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 9 13:07:54 2024 -0400 vkd3d-shader/tpf: Write default values for SM4. --- libs/vkd3d-shader/d3dbc.c | 2 ++ libs/vkd3d-shader/tpf.c | 30 +++++++++++++++++++++++++++++- tests/hlsl_d3d12.c | 4 ++-- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 8e26fd8e..20c0e7db 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1744,6 +1744,8 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe } put_u32(buffer, 0); /* type */ put_u32(buffer, 0); /* FIXME: default value */ + if (var->default_values) + FIXME("Write SM1 default values.\n"); } } diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5df7bbe7..0340091d 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3522,7 +3522,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) put_u32(&buffer, var->data_type->reg_size[HLSL_REGSET_NUMERIC] * sizeof(float)); put_u32(&buffer, flags); put_u32(&buffer, 0); /* type */ - put_u32(&buffer, 0); /* FIXME: default value */ + put_u32(&buffer, 0); /* default value */ if (profile->major_version >= 5) { @@ -3546,6 +3546,34 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) set_u32(&buffer, var_offset, string_offset); write_sm4_type(ctx, &buffer, var->data_type); set_u32(&buffer, var_offset + 4 * sizeof(uint32_t), var->data_type->bytecode_offset); + + if (var->default_values) + { + unsigned int reg_size = var->data_type->reg_size[HLSL_REGSET_NUMERIC]; + unsigned int comp_count = hlsl_type_component_count(var->data_type); + unsigned int default_value_offset; + unsigned int k; + + default_value_offset = bytecode_reserve_bytes(&buffer, reg_size * sizeof(uint32_t)); + set_u32(&buffer, var_offset + 5 * sizeof(uint32_t), default_value_offset); + + for (k = 0; k < comp_count; ++k) + { + struct hlsl_type *comp_type = hlsl_type_get_component_type(ctx, var->data_type, k); + unsigned int comp_offset; + enum hlsl_regset regset; + + comp_offset = hlsl_type_get_component_offset(ctx, var->data_type, k, &regset); + if (regset == HLSL_REGSET_NUMERIC) + { + if (comp_type->e.numeric.type == HLSL_TYPE_DOUBLE) + hlsl_fixme(ctx, &var->loc, "Write double default values."); + + set_u32(&buffer, default_value_offset + comp_offset * sizeof(uint32_t), + var->default_values[k].value.u); + } + } + } ++j; } } diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index c06693cf..1292e100 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1863,7 +1863,7 @@ static void test_default_values_reflection(void) if (expect->var_desc.DefaultValue) { - todo ok(var_desc.DefaultValue, "Didn't get default value.\n"); + ok(var_desc.DefaultValue, "Didn't get default value.\n"); if (var_desc.DefaultValue && var_desc.Size == expect->var_desc.Size) { @@ -1872,7 +1872,7 @@ static void test_default_values_reflection(void) unsigned int var_val = *((unsigned int *)var_desc.DefaultValue + k); unsigned int expect_val = *((unsigned int *)expect->var_desc.DefaultValue + k); - ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", + todo_if(var_val != expect_val) ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", expect_val, var_val, 4 * k); } }

1 0

Francisco Casas : tests: Test default values using reflection.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: vkd3d Branch: master Commit: b44a25ce191afb2464b14c81ac88d22d552b8b64 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b44a25ce191afb2464b14c81ac88d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 16 14:17:06 2024 -0400 tests: Test default values using reflection. --- tests/hlsl_d3d12.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 215d624a..c06693cf 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1698,6 +1698,201 @@ static void test_reflection(void) } } +static void test_default_values_reflection(void) +{ + unsigned int refcount; + HRESULT hr; + + static const char ps1_source[] = + "struct\n" + "{\n" + " float2 aa;\n" + " float2x1 bb;\n" + " int3 cc, dd;\n" + " float2x3 ee;\n" + " row_major float2x3 ff;\n" + " struct {\n" + " float2 aa[3];\n" + " float3 bb;\n" + " } gg;\n" + "} st = {1, 2, 3, 4, 5, 6, 7, 8, float4(9.5, 10.6, 11, 12), 13, 14, 15, 16, 17, 18,\n" + " 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};\n" + "float2 unused = {1, 2};\n" + "float3x2 another = {1, 2, 3, 4, 5, 6};\n" + "cbuffer b1\n" + "{\n" + " float2 hh = {1, 2};\n" + " float3x2 ii[2] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};\n" + "}\n" + "cbuffer b2_unused\n" + "{\n" + " float jj = {5};\n" + "}\n" + "float nondefault_unused;\n" + "float nondefault;\n" + "float4 main() : sv_target\n" + "{\n" + " return another[0][1] + st.gg.aa[1].y + nondefault + hh.y;\n" + "}"; + + struct shader_variable + { + D3D12_SHADER_VARIABLE_DESC var_desc; + }; + + struct shader_buffer + { + D3D12_SHADER_BUFFER_DESC desc; + const struct shader_variable *vars; + }; + + static const unsigned int ps1_globals_st_default_value[] = + { + 0x3f800000, 0x40000000, 0x40400000, 0x40800000, + 0x00000005, 0x00000006, 0x00000007, 0x00000000, + 0x00000008, 0x00000009, 0x0000000a, 0x00000000, + 0x41300000, 0x41400000, 0x00000000, 0x00000000, + 0x41500000, 0x41600000, 0x00000000, 0x00000000, + 0x41700000, 0x41800000, 0x00000000, 0x00000000, + 0x41880000, 0x41980000, 0x41a80000, 0x00000000, + 0x41900000, 0x41a00000, 0x41b00000, 0x00000000, + 0x41b80000, 0x41c00000, 0x00000000, 0x00000000, + 0x41c80000, 0x41d00000, 0x00000000, 0x00000000, + 0x41d80000, 0x41e00000, 0x00000000, 0x00000000, + 0x41e80000, 0x41f00000, 0x41f80000, + }; + + static const unsigned int ps1_globals_unused_default_value[] = + { + 0x3f800000, 0x40000000, + }; + + static const unsigned int ps1_globals_another_default_value[] = + { + 0x3f800000, 0x40000000, 0x40400000, 0x00000000, + 0x40800000, 0x40a00000, 0x40c00000, + }; + + static const struct shader_variable ps1_globals_vars[] = + { + {{"st", 0, 188, D3D_SVF_USED, (void *)ps1_globals_st_default_value}}, + {{"unused", 192, 8, 0, (void *)ps1_globals_unused_default_value}}, + {{"another", 208, 28, D3D_SVF_USED, (void *)ps1_globals_another_default_value}}, + {{"nondefault_unused", 236, 4, 0, NULL}}, + {{"nondefault", 240, 4, D3D_SVF_USED, NULL}}, + }; + + static const unsigned int ps1_b1_hh_default_value[] = + { + 0x3f800000, 0x40000000, + }; + + static const unsigned int ps1_b1_ii_default_value[] = + { + 0x3f800000, 0x40000000, 0x40400000, 0x00000000, + 0x40800000, 0x40a00000, 0x40c00000, 0x00000000, + 0x40e00000, 0x41000000, 0x41100000, 0x00000000, + 0x41200000, 0x41300000, 0x41400000, + }; + + static const struct shader_variable ps1_b1_vars[] = + { + {{"hh", 0, 8, D3D_SVF_USED, (void *)ps1_b1_hh_default_value}}, + {{"ii", 16, 60, 0, (void *)ps1_b1_ii_default_value}}, + }; + + static const struct shader_buffer ps1_buffers[] = + { + {{"$Globals", D3D_CT_CBUFFER, ARRAY_SIZE(ps1_globals_vars), 256}, ps1_globals_vars}, + {{"b1", D3D_CT_CBUFFER, ARRAY_SIZE(ps1_b1_vars), 80}, ps1_b1_vars}, + }; + + static const struct + { + const char *source; + const char *profile; + const struct shader_buffer *buffers; + size_t buffer_count; + } + tests[] = + { + {ps1_source, "ps_5_0", ps1_buffers, ARRAY_SIZE(ps1_buffers)}, + }; + + for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) + { + ID3D10Blob *code = compile_shader_flags(tests[t].source, + tests[t].profile, D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + ID3D12ShaderReflection *reflection; + D3D12_SHADER_DESC shader_desc; + + hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + &IID_ID3D12ShaderReflection, (void **)&reflection); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12ShaderReflection_GetDesc(reflection, &shader_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(shader_desc.ConstantBuffers == tests[t].buffer_count, "Got %u buffers.\n", shader_desc.ConstantBuffers); + + for (unsigned int i = 0; i < shader_desc.ConstantBuffers; ++i) + { + const struct shader_buffer *expect_buffer = &tests[t].buffers[i]; + ID3D12ShaderReflectionConstantBuffer *cbuffer; + D3D12_SHADER_BUFFER_DESC buffer_desc; + + vkd3d_test_push_context("Buffer %u", i); + + cbuffer = ID3D12ShaderReflection_GetConstantBufferByIndex(reflection, i); + hr = ID3D12ShaderReflectionConstantBuffer_GetDesc(cbuffer, &buffer_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(buffer_desc.Type == expect_buffer->desc.Type, "Got type %#x.\n", buffer_desc.Type); + ok(buffer_desc.Variables == expect_buffer->desc.Variables, "Got %u variables.\n", buffer_desc.Variables); + + for (unsigned int j = 0; j < buffer_desc.Variables; ++j) + { + const struct shader_variable *expect = &expect_buffer->vars[j]; + ID3D12ShaderReflectionVariable *var; + D3D12_SHADER_VARIABLE_DESC var_desc; + + vkd3d_test_push_context("Variable %u", j); + + var = ID3D12ShaderReflectionConstantBuffer_GetVariableByIndex(cbuffer, j); + hr = ID3D12ShaderReflectionVariable_GetDesc(var, &var_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(var_desc.Size == expect->var_desc.Size, "Got size %u.\n", var_desc.Size); + + if (expect->var_desc.DefaultValue) + { + todo ok(var_desc.DefaultValue, "Didn't get default value.\n"); + + if (var_desc.DefaultValue && var_desc.Size == expect->var_desc.Size) + { + for (unsigned int k = 0; k < var_desc.Size/4; ++k) + { + unsigned int var_val = *((unsigned int *)var_desc.DefaultValue + k); + unsigned int expect_val = *((unsigned int *)expect->var_desc.DefaultValue + k); + + ok(var_val == expect_val, "Expected default value 0x%08x, but got 0x%08x, at offset %u.\n", + expect_val, var_val, 4 * k); + } + } + } + else + { + ok(!var_desc.DefaultValue, "Got default value %p.\n", var_desc.DefaultValue); + } + + vkd3d_test_pop_context(); + } + vkd3d_test_pop_context(); + } + + ID3D10Blob_Release(code); + refcount = ID3D12ShaderReflection_Release(reflection); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + } +} + static void check_signature_element_(int line, const D3D12_SIGNATURE_PARAMETER_DESC *desc, const D3D12_SIGNATURE_PARAMETER_DESC *expect) { @@ -2002,6 +2197,7 @@ START_TEST(hlsl_d3d12) run_test(test_create_blob); run_test(test_get_blob_part); run_test(test_reflection); + run_test(test_default_values_reflection); run_test(test_signature_reflection); run_test(test_disassemble_shader); }

1 0