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

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics EmitStream, CutStream and EmitThenCutStream.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 962096f179fe63dcd07e45c82db40d8414c554d0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/962096f179fe63dcd07e45c82db40… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Apr 19 12:47:56 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsics EmitStream, CutStream and EmitThenCutStream. --- libs/vkd3d-shader/dxil.c | 39 +++++++++++++++++++++++++++++++++++++++ tests/hlsl/geometry.shader_test | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index cca8b512..29f73636 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -39,6 +39,7 @@ static const unsigned int dx_max_thread_group_size[3] = {1024, 1024, 64}; static const unsigned int MAX_GS_INSTANCE_COUNT = 32; /* kMaxGSInstanceCount */ static const unsigned int MAX_GS_OUTPUT_TOTAL_SCALARS = 1024; /* kMaxGSOutputTotalScalars */ +static const unsigned int MAX_GS_OUTPUT_STREAMS = 4; #define VKD3D_SHADER_SWIZZLE_64_MASK \ (VKD3D_SHADER_SWIZZLE_MASK << VKD3D_SHADER_SWIZZLE_SHIFT(0) \ @@ -434,6 +435,9 @@ enum dx_intrinsic_opcode DX_GROUP_ID = 94, DX_THREAD_ID_IN_GROUP = 95, DX_FLATTENED_THREAD_ID_IN_GROUP = 96, + DX_EMIT_STREAM = 97, + DX_CUT_STREAM = 98, + DX_EMIT_THEN_CUT_STREAM = 99, DX_MAKE_DOUBLE = 101, DX_SPLIT_DOUBLE = 102, DX_LOAD_OUTPUT_CONTROL_POINT = 103, @@ -4930,6 +4934,38 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int ins->handler_idx = VKD3DSIH_NOP; } +static void sm6_parser_emit_dx_stream(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; + unsigned int i; + + vsir_instruction_init(ins, &sm6->p.location, (op == DX_CUT_STREAM) ? VKD3DSIH_CUT_STREAM : VKD3DSIH_EMIT_STREAM); + + if (!(src_param = instruction_src_params_alloc(ins, 1, sm6))) + return; + + i = sm6_value_get_constant_uint(operands[0]); + if (i >= MAX_GS_OUTPUT_STREAMS) + { + WARN("Invalid stream index %u.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Output stream index %u is invalid.", i); + } + + /* VKD3D_DATA_UNUSED would be more reasonable, but TPF uses data type 0 here. */ + register_init_with_id(&src_param->reg, VKD3DSPR_STREAM, 0, i); + src_param_init(src_param); + + if (op == DX_EMIT_THEN_CUT_STREAM) + { + ++state->ins; + ++state->code_block->instruction_count; + sm6_parser_emit_dx_stream(sm6, DX_CUT_STREAM, operands, state); + } +} + static void sm6_parser_emit_dx_discard(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -6116,6 +6152,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_COUNT_BITS ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_COVERAGE ] = {"i", "", sm6_parser_emit_dx_coverage}, [DX_CREATE_HANDLE ] = {"H", "ccib", sm6_parser_emit_dx_create_handle}, + [DX_CUT_STREAM ] = {"v", "c", sm6_parser_emit_dx_stream}, [DX_DERIV_COARSEX ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_COARSEY ] = {"e", "R", sm6_parser_emit_dx_unary}, [DX_DERIV_FINEX ] = {"e", "R", sm6_parser_emit_dx_unary}, @@ -6125,6 +6162,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_DOT2 ] = {"g", "RRRR", sm6_parser_emit_dx_dot}, [DX_DOT3 ] = {"g", "RRRRRR", sm6_parser_emit_dx_dot}, [DX_DOT4 ] = {"g", "RRRRRRRR", sm6_parser_emit_dx_dot}, + [DX_EMIT_STREAM ] = {"v", "c", sm6_parser_emit_dx_stream}, + [DX_EMIT_THEN_CUT_STREAM ] = {"v", "c", sm6_parser_emit_dx_stream}, [DX_EXP ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_FABS ] = {"g", "R", sm6_parser_emit_dx_fabs}, [DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/geometry.shader_test b/tests/hlsl/geometry.shader_test index a5c21e78..c99b8f8b 100644 --- a/tests/hlsl/geometry.shader_test +++ b/tests/hlsl/geometry.shader_test @@ -59,7 +59,7 @@ float4 main(struct ps_data ps_input) : SV_Target } [test] -todo draw point list 1 +todo(sm<6) draw point list 1 probe rtv 0 (320, 190) rgba (0.0, 0.0, 0.0, 0.0) probe rtv 0 (255, 240) rgba (0.0, 0.0, 0.0, 0.0) probe rtv 0 (320, 240) rgba (0.0, 1.0, 1.0, 1.0)

1 0

Conor McCarthy : tests/hlsl: Add a geometry shader test.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 00b0b8d65cc61eee4ba51c3ec479e267ad65b92c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/00b0b8d65cc61eee4ba51c3ec479e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Apr 19 12:33:56 2024 +1000 tests/hlsl: Add a geometry shader test. --- Makefile.am | 1 + tests/hlsl/geometry.shader_test | 67 +++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 32 ++++++++++++++++++++ tests/shader_runner.h | 2 ++ tests/shader_runner_d3d11.c | 24 ++++++++++++++- tests/shader_runner_d3d12.c | 43 +++++++++++++++++++++++--- tests/shader_runner_gl.c | 11 +++++-- tests/shader_runner_vulkan.c | 7 ++++- 8 files changed, 179 insertions(+), 8 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Load geometry shader properties.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 4fd2d5aa77f9093cc88558a6e586d5a07f52a1ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fd2d5aa77f9093cc88558a6e586d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Apr 19 12:43:24 2024 +1000 vkd3d-shader/dxil: Load geometry shader properties. --- libs/vkd3d-shader/dxil.c | 151 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 2 files changed, 153 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b5e54e6a..cca8b512 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -37,6 +37,9 @@ static const size_t MAX_IR_INSTRUCTIONS_PER_DXIL_INSTRUCTION = 11; static const unsigned int dx_max_thread_group_size[3] = {1024, 1024, 64}; +static const unsigned int MAX_GS_INSTANCE_COUNT = 32; /* kMaxGSInstanceCount */ +static const unsigned int MAX_GS_OUTPUT_TOTAL_SCALARS = 1024; /* kMaxGSOutputTotalScalars */ + #define VKD3D_SHADER_SWIZZLE_64_MASK \ (VKD3D_SHADER_SWIZZLE_MASK << VKD3D_SHADER_SWIZZLE_SHIFT(0) \ | VKD3D_SHADER_SWIZZLE_MASK << VKD3D_SHADER_SWIZZLE_SHIFT(1)) @@ -283,6 +286,18 @@ enum dxil_element_additional_tag ADDITIONAL_TAG_USED_MASK = 3, }; +enum dxil_input_primitive +{ + INPUT_PRIMITIVE_UNDEFINED = 0, + INPUT_PRIMITIVE_POINT = 1, + INPUT_PRIMITIVE_LINE = 2, + INPUT_PRIMITIVE_TRIANGLE = 3, + INPUT_PRIMITIVE_LINEWITHADJACENCY = 6, + INPUT_PRIMITIVE_TRIANGLEWITHADJACENY = 7, + INPUT_PRIMITIVE_PATCH1 = 8, + INPUT_PRIMITIVE_PATCH32 = 39, +}; + enum dxil_shader_properties_tag { SHADER_PROPERTIES_FLAGS = 0, @@ -9467,6 +9482,17 @@ static void sm6_parser_emit_dcl_count(struct sm6_parser *sm6, enum vkd3d_shader_ ins->declaration.count = count; } +static void sm6_parser_emit_dcl_primitive_topology(struct sm6_parser *sm6, + enum vkd3d_shader_opcode handler_idx, enum vkd3d_primitive_type primitive_type, + unsigned int patch_vertex_count) +{ + struct vkd3d_shader_instruction *ins; + + ins = sm6_parser_add_instruction(sm6, handler_idx); + ins->declaration.primitive_type.type = primitive_type; + ins->declaration.primitive_type.patch_vertex_count = patch_vertex_count; +} + static void sm6_parser_emit_dcl_tessellator_domain(struct sm6_parser *sm6, enum vkd3d_tessellator_domain tessellator_domain) { @@ -9551,6 +9577,128 @@ static void sm6_parser_emit_dcl_max_tessellation_factor(struct sm6_parser *sm6, ins->declaration.max_tessellation_factor = max_tessellation_factor; } +static void sm6_parser_gs_properties_init(struct sm6_parser *sm6, const struct sm6_metadata_value *m) +{ + enum vkd3d_primitive_type input_primitive = VKD3D_PT_TRIANGLELIST, output_primitive; + unsigned int i, input_control_point_count = 1, patch_vertex_count = 0; + const struct sm6_metadata_node *node; + unsigned int operands[5] = {0}; + + if (!m || !sm6_metadata_value_is_node(m)) + { + WARN("Missing or invalid GS properties.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader properties node is missing or invalid."); + return; + } + + node = m->u.node; + if (node->operand_count < ARRAY_SIZE(operands)) + { + WARN("Invalid operand count %u.\n", node->operand_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND_COUNT, + "Geometry shader properties operand count %u is invalid.", node->operand_count); + return; + } + if (node->operand_count > ARRAY_SIZE(operands)) + { + WARN("Ignoring %zu extra operands.\n", node->operand_count - ARRAY_SIZE(operands)); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring %zu extra operands for geometry shader properties.", + node->operand_count - ARRAY_SIZE(operands)); + } + + for (i = 0; i < node->operand_count; ++i) + { + if (!sm6_metadata_get_uint_value(sm6, node->operands[i], &operands[i])) + { + WARN("GS property at index %u is not a uint value.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader properties operand at index %u is not an integer.", i); + } + } + + switch (i = operands[0]) + { + case INPUT_PRIMITIVE_POINT: + input_primitive = VKD3D_PT_POINTLIST; + input_control_point_count = 1; + break; + + case INPUT_PRIMITIVE_LINE: + input_primitive = VKD3D_PT_LINELIST; + input_control_point_count = 2; + break; + + case INPUT_PRIMITIVE_TRIANGLE: + input_primitive = VKD3D_PT_TRIANGLELIST; + input_control_point_count = 3; + break; + + case INPUT_PRIMITIVE_LINEWITHADJACENCY: + input_primitive = VKD3D_PT_LINELIST_ADJ; + input_control_point_count = 4; + break; + + case INPUT_PRIMITIVE_TRIANGLEWITHADJACENY: + input_primitive = VKD3D_PT_TRIANGLELIST_ADJ; + input_control_point_count = 6; + break; + + default: + if (i >= INPUT_PRIMITIVE_PATCH1 && i <= INPUT_PRIMITIVE_PATCH32) + { + input_primitive = VKD3D_PT_PATCH; + patch_vertex_count = i - INPUT_PRIMITIVE_PATCH1 + 1; + break; + } + + WARN("Unhandled input primitive %u.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader input primitive %u is unhandled.", i); + break; + } + + sm6_parser_emit_dcl_primitive_topology(sm6, VKD3DSIH_DCL_INPUT_PRIMITIVE, input_primitive, patch_vertex_count); + sm6->p.program.input_control_point_count = input_control_point_count; + + i = operands[1]; + /* Max total scalar count sets an upper limit. We would need to scan outputs to be more precise. */ + if (i > MAX_GS_OUTPUT_TOTAL_SCALARS) + { + WARN("GS output vertex count %u invalid.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader output vertex count %u is invalid.", i); + } + sm6_parser_emit_dcl_count(sm6, VKD3DSIH_DCL_VERTICES_OUT, i); + + if (operands[2] > 1) + { + FIXME("Unhandled stream mask %#x.\n", operands[2]); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader stream mask %#x is unhandled.", operands[2]); + } + + output_primitive = operands[3]; + if (output_primitive == VKD3D_PT_UNDEFINED || output_primitive >= VKD3D_PT_COUNT) + { + WARN("Unhandled output primitive %u.\n", output_primitive); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader output primitive %u is unhandled.", output_primitive); + output_primitive = VKD3D_PT_TRIANGLELIST; + } + sm6_parser_emit_dcl_primitive_topology(sm6, VKD3DSIH_DCL_OUTPUT_TOPOLOGY, output_primitive, 0); + + i = operands[4]; + if (!i || i > MAX_GS_INSTANCE_COUNT) + { + WARN("GS instance count %u invalid.\n", i); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_PROPERTIES, + "Geometry shader instance count %u is invalid.", i); + } + sm6_parser_emit_dcl_count(sm6, VKD3DSIH_DCL_GS_INSTANCES, i); +} + static enum vkd3d_tessellator_domain sm6_parser_ds_properties_init(struct sm6_parser *sm6, const struct sm6_metadata_value *m) { @@ -9741,6 +9889,9 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) case SHADER_PROPERTIES_FLAGS: sm6_parser_emit_global_flags(sm6, node->operands[i + 1]); break; + case SHADER_PROPERTIES_GEOMETRY: + sm6_parser_gs_properties_init(sm6, node->operands[i + 1]); + break; case SHADER_PROPERTIES_DOMAIN: tessellator_domain = sm6_parser_ds_properties_init(sm6, node->operands[i + 1]); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a40c4eb1..a56c6898 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1164,6 +1164,8 @@ enum vkd3d_primitive_type VKD3D_PT_TRIANGLELIST_ADJ = 12, VKD3D_PT_TRIANGLESTRIP_ADJ = 13, VKD3D_PT_PATCH = 14, + + VKD3D_PT_COUNT = 15, }; struct vkd3d_shader_primitive_type

1 0

Conor McCarthy : vkd3d-shader/ir: Validate geometry shader properties.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: cc49f26af135e8cef6ad2f66450b86bf183565df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc49f26af135e8cef6ad2f66450b8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Apr 19 12:45:09 2024 +1000 vkd3d-shader/ir: Validate geometry shader properties. --- libs/vkd3d-shader/ir.c | 26 ++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 121b0fe3..c6ecbdd9 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -5753,6 +5753,32 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_DCL_OUTPUT: return; + case VKD3DSIH_DCL_INPUT_PRIMITIVE: + if (instruction->declaration.primitive_type.type == VKD3D_PT_UNDEFINED + || instruction->declaration.primitive_type.type >= VKD3D_PT_COUNT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_GS, "GS input primitive %u is invalid.", + instruction->declaration.primitive_type.type); + return; + + case VKD3DSIH_DCL_VERTICES_OUT: + if (instruction->declaration.count > 1024) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_GS, "GS output vertex count %u is invalid.", + instruction->declaration.count); + return; + + case VKD3DSIH_DCL_OUTPUT_TOPOLOGY: + if (instruction->declaration.primitive_type.type == VKD3D_PT_UNDEFINED + || instruction->declaration.primitive_type.type >= VKD3D_PT_COUNT) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_GS, "GS output primitive %u is invalid.", + instruction->declaration.primitive_type.type); + return; + + case VKD3DSIH_DCL_GS_INSTANCES: + if (!instruction->declaration.count || instruction->declaration.count > 32) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_GS, "GS instance count %u is invalid.", + instruction->declaration.count); + return; + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: if (!instruction->declaration.count || instruction->declaration.count > 32) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION, "Output control point count %u is invalid.", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a56c6898..3951ca70 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -223,6 +223,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW = 9016, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE = 9017, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION = 9018, + VKD3D_SHADER_ERROR_VSIR_INVALID_GS = 9019, VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300, };

1 0

Stefan Dösinger : vkd3d: Add a win32 version of vkd3d_get_program_name.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: d6b1e62ffca368d65e2b03657cc66b391728d767 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d6b1e62ffca368d65e2b03657cc66… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 27 12:21:44 2023 +0300 vkd3d: Add a win32 version of vkd3d_get_program_name. --- libs/vkd3d/utils.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 58747342..11029c9f 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -901,6 +901,30 @@ bool vkd3d_get_program_name(char program_name[PATH_MAX]) return true; } +#elif defined(WIN32) + +bool vkd3d_get_program_name(char program_name[PATH_MAX]) +{ + char buffer[MAX_PATH]; + char *p, *name; + size_t len; + + *program_name = '\0'; + len = GetModuleFileNameA(NULL, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return false; + + name = buffer; + if ((p = strrchr(name, '/'))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + memcpy(program_name, name, len); + return true; +} + #else bool vkd3d_get_program_name(char program_name[PATH_MAX])

1 0

Nikolay Sivov : vkd3d-shader/fx: Initial support for writing sample state objects.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 0053cc52b7e0f16e42df3cd258d2cec3227b02f6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0053cc52b7e0f16e42df3cd258d2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 21 00:33:41 2024 +0200 vkd3d-shader/fx: Initial support for writing sample state objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 347 +++++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 2 + 2 files changed, 338 insertions(+), 11 deletions(-)

1 0

Nikolay Sivov : vkd3d-shader/fx: Filter out unsupported object types.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 1a79d1e945a691fcd8be922445fe207d3156d424 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1a79d1e945a691fcd8be922445fe2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 04:05:00 2024 +0200 vkd3d-shader/fx: Filter out unsupported object types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9c2bd72a..c55577ad 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1122,7 +1122,7 @@ static void write_buffers(struct fx_write_context *fx) } } -static bool is_object_variable(const struct hlsl_ir_var *var) +static bool is_supported_object_variable(const struct hlsl_ctx *ctx, const struct hlsl_ir_var *var) { const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type); @@ -1133,7 +1133,13 @@ static bool is_object_variable(const struct hlsl_ir_var *var) case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_SAMPLER: case HLSL_CLASS_TEXTURE: + return true; case HLSL_CLASS_UAV: + if (ctx->profile->major_version < 5) + return false; + if (type->e.resource.rasteriser_ordered) + return false; + return true; case HLSL_CLASS_VERTEX_SHADER: return true; @@ -1144,14 +1150,15 @@ static bool is_object_variable(const struct hlsl_ir_var *var) static void write_objects(struct fx_write_context *fx, bool shared) { + struct hlsl_ctx *ctx = fx->ctx; struct hlsl_ir_var *var; if (shared && !fx->child_effect) return; - LIST_FOR_EACH_ENTRY(var, &fx->ctx->extern_vars, struct hlsl_ir_var, extern_entry) + LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { - if (!is_object_variable(var)) + if (!is_supported_object_variable(ctx, var)) continue; if (fx->child_effect && (shared != !!(var->storage_modifiers & HLSL_STORAGE_SHARED)))

1 0

Nikolay Sivov : vkd3d-shader/fx: Set UAV count in the header.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 3c6470e3b2590fe44bee4fa87b95ce9d4cee21b4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3c6470e3b2590fe44bee4fa87b95c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:40:14 2024 +0200 vkd3d-shader/fx: Set UAV count in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index c55577ad..1100dd2e 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -90,6 +90,7 @@ struct fx_write_context uint32_t dsv_count; uint32_t rtv_count; uint32_t texture_count; + uint32_t uav_count; int status; bool child_effect; @@ -1029,6 +1030,7 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ fx->texture_count += elements_count; break; case HLSL_CLASS_UAV: + fx->uav_count += elements_count; break; case HLSL_CLASS_PIXEL_SHADER: @@ -1263,7 +1265,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.shader_count); put_u32(&buffer, 0); /* Inline shader count. */ put_u32(&buffer, fx.group_count); /* Group count. */ - put_u32(&buffer, 0); /* UAV count. */ + put_u32(&buffer, fx.uav_count); put_u32(&buffer, 0); /* Interface variables count. */ put_u32(&buffer, 0); /* Interface variable element count. */ put_u32(&buffer, 0); /* Class instance elements count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Set RTV counter in the header.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 162d8760bee5e814e8dbe07a3d2640c089e74517 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/162d8760bee5e814e8dbe07a3d264… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 20 16:19:54 2024 +0200 vkd3d-shader/fx: Set RTV counter in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index e99ca782..9e61fc23 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -88,6 +88,7 @@ struct fx_write_context uint32_t shader_variable_count; uint32_t parameter_count; uint32_t dsv_count; + uint32_t rtv_count; int status; bool child_effect; @@ -1021,6 +1022,8 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ switch (type->class) { case HLSL_CLASS_RENDER_TARGET_VIEW: + fx->rtv_count += elements_count; + break; case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: break; @@ -1187,7 +1190,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ - put_u32(&buffer, 0); /* Rendertarget view count. */ + put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */ @@ -1245,7 +1248,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ - put_u32(&buffer, 0); /* Rendertarget view count. */ + put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Fix shader counter in the header.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 9bbed1498742951d99437d8e2b95712be1045df2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9bbed1498742951d99437d8e2b957… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 20 16:30:05 2024 +0200 vkd3d-shader/fx: Fix shader counter in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9528bf98..9c2bd72a 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -85,7 +85,7 @@ struct fx_write_context uint32_t numeric_variable_count; uint32_t object_variable_count; uint32_t shared_object_count; - uint32_t shader_variable_count; + uint32_t shader_count; uint32_t parameter_count; uint32_t dsv_count; uint32_t rtv_count; @@ -1036,7 +1036,7 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ /* FIXME: write shader blobs, once parser support works. */ for (i = 0; i < elements_count; ++i) put_u32(buffer, 0); - ++fx->shader_variable_count; + fx->shader_count += elements_count; break; case HLSL_CLASS_DEPTH_STENCIL_VIEW: @@ -1195,7 +1195,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); - put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ + put_u32(&buffer, fx.shader_count); put_u32(&buffer, 0); /* Inline shader count. */ set_u32(&buffer, size_offset, fx.unstructured.size); @@ -1253,7 +1253,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.dsv_count); - put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ + put_u32(&buffer, fx.shader_count); put_u32(&buffer, 0); /* Inline shader count. */ put_u32(&buffer, fx.group_count); /* Group count. */ put_u32(&buffer, 0); /* UAV count. */

1 0