[PATCH v9 5/8] vkd3d-shader/ir: Keep a reference to the parser inside struct vsir_cfg.

[Giovanni Mascellani]

From: Giovanni Mascellani

This is meant only to emit error messages. All accesses to the program
should happen through the `program' field.
---
 libs/vkd3d-shader/ir.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 05997241f..1fd92dd8e 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -3098,6 +3098,7 @@ static void vsir_block_cleanup(struct vsir_block *block)

struct vsir_cfg
 {
+    struct vkd3d_shader_parser *parser;
     struct vsir_program *program;
     struct vsir_block *blocks;
     struct vsir_block *entry;
@@ -3185,13 +3186,15 @@ static void vsir_cfg_dump_dot(struct vsir_cfg *cfg)
     TRACE("}\n");
 }

-static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vsir_program *program)
+static enum vkd3d_result vsir_cfg_init(struct vsir_cfg *cfg, struct vkd3d_shader_parser *parser)
 {
+    struct vsir_program *program = &parser->program;
     struct vsir_block *current_block = NULL;
     enum vkd3d_result ret;
     size_t i;

memset(cfg, 0, sizeof(*cfg));
+    cfg->parser = parser;
     cfg->program = program;
     cfg->block_count = program->block_count;

@@ -3440,7 +3443,7 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser,
         if ((result = materialize_ssas_to_temps(parser)) < 0)
             return result;

-        if ((result = vsir_cfg_init(&cfg, &parser->program)) < 0)
+        if ((result = vsir_cfg_init(&cfg, parser)) < 0)
             return result;

vsir_cfg_compute_dominators(&cfg);