wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Remove the io_normaliser.instructions field.

Browse Source 
It's effectively unused, and struct vkd3d_shader_instruction_array is
not meant to be copied by value. If io_normaliser.instructions were to
be modified it might leave program->instructions in an inconsistent
state.
This commit is contained in:
Francisco Casas
2025-08-04 15:00:49 -04:00
committed by Henri Verbeet
parent b3badec039
commit f818d052cd
Notes: Henri Verbeet 2025-08-06 13:02:54 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1669
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2525,7 +2525,6 @@ struct io_normaliser
{ {
struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_message_context *message_context;
enum vkd3d_result result; enum vkd3d_result result;
struct vkd3d_shader_instruction_array instructions;
enum vkd3d_shader_type shader_type; enum vkd3d_shader_type shader_type;
uint8_t major; uint8_t major;
struct shader_signature *input_signature; struct shader_signature *input_signature;
@@ -3141,9 +3140,9 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi
static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program *program, static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program *program,
struct vsir_transformation_context *ctx) struct vsir_transformation_context *ctx)
{ {
struct io_normaliser normaliser = {ctx->message_context, VKD3D_OK, program->instructions}; struct vsir_program_iterator it = vsir_program_iterator(&program->instructions);
struct io_normaliser normaliser = {ctx->message_context, VKD3D_OK};
struct vkd3d_shader_instruction *ins; struct vkd3d_shader_instruction *ins;
struct vsir_program_iterator it;
enum vkd3d_result ret; enum vkd3d_result ret;
VKD3D_ASSERT(program->normalisation_level == VSIR_NORMALISED_HULL_CONTROL_POINT_IO); VKD3D_ASSERT(program->normalisation_level == VSIR_NORMALISED_HULL_CONTROL_POINT_IO);
@@ -3155,7 +3154,6 @@ static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program
normaliser.output_signature = &program->output_signature; normaliser.output_signature = &program->output_signature;
normaliser.patch_constant_signature = &program->patch_constant_signature; normaliser.patch_constant_signature = &program->patch_constant_signature;
it = vsir_program_iterator(&program->instructions);
for (ins = vsir_program_iterator_head(&it); ins; ins = vsir_program_iterator_next(&it)) for (ins = vsir_program_iterator_head(&it); ins; ins = vsir_program_iterator_next(&it))
{ {
switch (ins->opcode) switch (ins->opcode)
@@ -3183,19 +3181,14 @@ static enum vkd3d_result vsir_program_normalise_io_registers(struct vsir_program
normaliser.output_range_map, false)) < 0 normaliser.output_range_map, false)) < 0
|| (ret = shader_signature_merge(&normaliser, &program->patch_constant_signature, || (ret = shader_signature_merge(&normaliser, &program->patch_constant_signature,
normaliser.pc_range_map, true)) < 0) normaliser.pc_range_map, true)) < 0)
{
program->instructions = normaliser.instructions;
return ret; return ret;
}
normaliser.phase = VSIR_OP_INVALID; normaliser.phase = VSIR_OP_INVALID;
it = vsir_program_iterator(&normaliser.instructions);
for (ins = vsir_program_iterator_head(&it); ins; ins = vsir_program_iterator_next(&it)) for (ins = vsir_program_iterator_head(&it); ins; ins = vsir_program_iterator_next(&it))
{ {
shader_instruction_normalise_io_params(ins, &normaliser); shader_instruction_normalise_io_params(ins, &normaliser);
} }
program->instructions = normaliser.instructions;
program->use_vocp = normaliser.use_vocp; program->use_vocp = normaliser.use_vocp;
program->normalisation_level = VSIR_NORMALISED_SM6; program->normalisation_level = VSIR_NORMALISED_SM6;
return normaliser.result; return normaliser.result;