[PATCH 4/5] vkd3d-shader/ir: Store the SSA register count in struct vsir_program.

[Henri Verbeet]

From: Henri Verbeet

---
 libs/vkd3d-shader/dxil.c                 |  2 +-
 libs/vkd3d-shader/ir.c                   | 15 ++++++++-------
 libs/vkd3d-shader/spirv.c                |  4 ++--
 libs/vkd3d-shader/vkd3d_shader_private.h |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 5133c0e08..7e5f3b779 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -6771,7 +6771,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t
         return VKD3D_ERROR_OUT_OF_MEMORY;
     }

-    sm6->p.shader_desc.ssa_count = sm6->ssa_next_id;
+    sm6->p.program.ssa_count = sm6->ssa_next_id;

if (!(fn = sm6_parser_get_function(sm6, sm6->entry_point)))
     {
diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 48ac2a8e8..aac10a0d4 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -2465,10 +2465,11 @@ static void vsir_validate_register(struct validation_context *ctx,
             if (reg->idx[0].rel_addr)
                 validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a SSA register.");

-            if (reg->idx[0].offset >= ctx->parser->shader_desc.ssa_count)
+            if (reg->idx[0].offset >= ctx->program->ssa_count)
             {
-                validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "SSA register index %u exceeds the maximum count %u.",
-                        reg->idx[0].offset, ctx->parser->shader_desc.ssa_count);
+                validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
+                        "SSA register index %u exceeds the maximum count %u.",
+                        reg->idx[0].offset, ctx->program->ssa_count);
                 break;
             }

@@ -2600,7 +2601,7 @@ static void vsir_validate_dst_param(struct validation_context *ctx,
                     dst->shift);
     }

-    if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->parser->shader_desc.ssa_count)
+    if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->program->ssa_count)
     {
         struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset];

@@ -2635,7 +2636,7 @@ static void vsir_validate_src_param(struct validation_context *ctx,
         validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.",
                 src->modifiers);

-    if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->parser->shader_desc.ssa_count)
+    if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->program->ssa_count)
     {
         struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset];
         unsigned int i;
@@ -3007,7 +3008,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser)
     if (!(ctx.temps = vkd3d_calloc(parser->shader_desc.temp_count, sizeof(*ctx.temps))))
         goto fail;

-    if (!(ctx.ssas = vkd3d_calloc(parser->shader_desc.ssa_count, sizeof(*ctx.ssas))))
+    if (!(ctx.ssas = vkd3d_calloc(ctx.program->ssa_count, sizeof(*ctx.ssas))))
         goto fail;

for (ctx.instruction_idx = 0; ctx.instruction_idx < parser->program.instructions.count; ++ctx.instruction_idx)
@@ -3018,7 +3019,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser)
     if (ctx.depth != 0)
         validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "%zu nested blocks were not closed.", ctx.depth);

-    for (i = 0; i < parser->shader_desc.ssa_count; ++i)
+    for (i = 0; i < ctx.program->ssa_count; ++i)
     {
         struct validation_context_ssa_data *data = &ctx.ssas[i];

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index e66d16b3d..2b6b26d04 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -9686,8 +9686,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,

if (parser->shader_desc.temp_count)
         spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count);
-    if (parser->shader_desc.ssa_count)
-        spirv_compiler_allocate_ssa_register_ids(compiler, parser->shader_desc.ssa_count);
+    if (program->ssa_count)
+        spirv_compiler_allocate_ssa_register_ids(compiler, program->ssa_count);

spirv_compiler_emit_descriptor_declarations(compiler);

diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 8075ef302..d83628026 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1023,7 +1023,6 @@ struct vkd3d_shader_desc
     unsigned int input_control_point_count, output_control_point_count;

uint32_t temp_count;
-    unsigned int ssa_count;
     unsigned int block_count;

struct
@@ -1267,6 +1266,7 @@ struct vsir_program
     struct vkd3d_shader_version shader_version;
     struct vkd3d_shader_instruction_array instructions;

+    unsigned int ssa_count;
     bool use_vocp;
 };