wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Run validation after normalising Hull Shader control points I/O registers.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-05 17:25:53 +02:00 committed by Henri Verbeet
parent a3fdc447de
commit d8c41cc270
Notes: Henri Verbeet 2024-09-10 21:57:30 +02:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1049
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/dxil.c
View File

@ -3888,7 +3888,7 @@ static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shade
if (is_control_point) if (is_control_point)
{ {
if (reg_type == VKD3DSPR_OUTPUT) if (reg_type == VKD3DSPR_OUTPUT)
param->reg.idx[count].rel_addr = instruction_array_create_outpointid_param(&sm6->p.program->instructions); param->reg.idx[count].rel_addr = vsir_program_create_outpointid_param(sm6->p.program);
param->reg.idx[count++].offset = 0; param->reg.idx[count++].offset = 0;
} }

30
libs/vkd3d-shader/ir.c
View File

@ -905,9 +905,9 @@ static bool control_point_normaliser_is_in_control_point_phase(const struct cont
return normaliser->phase == VKD3DSIH_HS_CONTROL_POINT_PHASE; return normaliser->phase == VKD3DSIH_HS_CONTROL_POINT_PHASE;
} }
struct vkd3d_shader_src_param *instruction_array_create_outpointid_param( struct vkd3d_shader_src_param *vsir_program_create_outpointid_param(struct vsir_program *program)
struct vkd3d_shader_instruction_array *instructions)
{ {
struct vkd3d_shader_instruction_array *instructions = &program->instructions;
struct vkd3d_shader_src_param *rel_addr; struct vkd3d_shader_src_param *rel_addr;
if (instructions->outpointid_param) if (instructions->outpointid_param)
@ -1004,7 +1004,7 @@ static enum vkd3d_result control_point_normaliser_emit_hs_input(struct control_p
} }
static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_io( static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_io(
struct vkd3d_shader_instruction_array *src_instructions, const struct shader_signature *input_signature) struct vsir_program *program, struct vsir_normalisation_context *ctx)
{ {
struct vkd3d_shader_instruction_array *instructions; struct vkd3d_shader_instruction_array *instructions;
struct control_point_normaliser normaliser; struct control_point_normaliser normaliser;
@ -1014,12 +1014,12 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i
enum vkd3d_result ret; enum vkd3d_result ret;
unsigned int i, j; unsigned int i, j;
if (!(normaliser.outpointid_param = instruction_array_create_outpointid_param(src_instructions))) if (!(normaliser.outpointid_param = vsir_program_create_outpointid_param(program)))
{ {
ERR("Failed to allocate src param.\n"); ERR("Failed to allocate src param.\n");
return VKD3D_ERROR_OUT_OF_MEMORY; return VKD3D_ERROR_OUT_OF_MEMORY;
} }
normaliser.instructions = *src_instructions; normaliser.instructions = program->instructions;
instructions = &normaliser.instructions; instructions = &normaliser.instructions;
normaliser.phase = VKD3DSIH_INVALID; normaliser.phase = VKD3DSIH_INVALID;
@ -1056,22 +1056,22 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i
input_control_point_count = ins->declaration.count; input_control_point_count = ins->declaration.count;
break; break;
case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_CONTROL_POINT_PHASE:
*src_instructions = normaliser.instructions; program->instructions = normaliser.instructions;
return VKD3D_OK; return VKD3D_OK;
case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_HS_FORK_PHASE:
case VKD3DSIH_HS_JOIN_PHASE: case VKD3DSIH_HS_JOIN_PHASE:
/* ins may be relocated if the instruction array expands. */ /* ins may be relocated if the instruction array expands. */
location = ins->location; location = ins->location;
ret = control_point_normaliser_emit_hs_input(&normaliser, input_signature, ret = control_point_normaliser_emit_hs_input(&normaliser, &program->input_signature,
input_control_point_count, i, &location); input_control_point_count, i, &location);
*src_instructions = normaliser.instructions; program->instructions = normaliser.instructions;
return ret; return ret;
default: default:
break; break;
} }
} }
*src_instructions = normaliser.instructions; program->instructions = normaliser.instructions;
return VKD3D_OK; return VKD3D_OK;
} }
@ -6666,20 +6666,12 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL) if (program->shader_version.type == VKD3D_SHADER_TYPE_HULL)
{ {
vsir_transform(&ctx, vsir_program_flatten_hull_shader_phases); vsir_transform(&ctx, vsir_program_flatten_hull_shader_phases);
vsir_transform(&ctx, instruction_array_normalise_hull_shader_control_point_io);
}
if (ctx.result < 0) if (ctx.result < 0)
return ctx.result; return ctx.result;
if ((result = instruction_array_normalise_hull_shader_control_point_io(&program->instructions,
&program->input_signature)) < 0)
return result;
}
else
{
if (ctx.result < 0)
return ctx.result;
}
if ((result = vsir_program_normalise_io_registers(program, message_context)) < 0) if ((result = vsir_program_normalise_io_registers(program, message_context)) < 0)
return result; return result;

4
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -1354,8 +1354,6 @@ bool shader_instruction_array_add_icb(struct vkd3d_shader_instruction_array *ins
struct vkd3d_shader_immediate_constant_buffer *icb); struct vkd3d_shader_immediate_constant_buffer *icb);
bool shader_instruction_array_clone_instruction(struct vkd3d_shader_instruction_array *instructions, bool shader_instruction_array_clone_instruction(struct vkd3d_shader_instruction_array *instructions,
unsigned int dst, unsigned int src); unsigned int dst, unsigned int src);
struct vkd3d_shader_src_param *instruction_array_create_outpointid_param(
struct vkd3d_shader_instruction_array *instructions);
void shader_instruction_array_destroy(struct vkd3d_shader_instruction_array *instructions); void shader_instruction_array_destroy(struct vkd3d_shader_instruction_array *instructions);
enum vkd3d_shader_config_flags enum vkd3d_shader_config_flags
@ -1399,6 +1397,8 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t
const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context); const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context);
enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t config_flags, enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t config_flags,
const char *source_name, struct vkd3d_shader_message_context *message_context); const char *source_name, struct vkd3d_shader_message_context *message_context);
struct vkd3d_shader_src_param *vsir_program_create_outpointid_param(
struct vsir_program *program);
bool vsir_instruction_init_with_params(struct vsir_program *program, bool vsir_instruction_init_with_params(struct vsir_program *program,
struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_location *location, struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_location *location,
enum vkd3d_shader_opcode opcode, unsigned int dst_count, unsigned int src_count); enum vkd3d_shader_opcode opcode, unsigned int dst_count, unsigned int src_count);