[PATCH 0/1] MR515: vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input().

[Conor McCarthy (＠cmccarthy)]

Fixes invalid reads in valgrind.

[PATCH 1/1] vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/ir.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 710811c67..a35ef8620 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -463,6 +463,7 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i
     struct vkd3d_shader_instruction_array *instructions;
     struct control_point_normaliser normaliser;
     unsigned int input_control_point_count;
+    struct vkd3d_shader_location location;
     struct vkd3d_shader_instruction *ins;
     enum vkd3d_result ret;
     unsigned int i, j;
@@ -513,8 +514,10 @@ static enum vkd3d_result instruction_array_normalise_hull_shader_control_point_i
                 return VKD3D_OK;
             case VKD3DSIH_HS_FORK_PHASE:
             case VKD3DSIH_HS_JOIN_PHASE:
+                /* ins may be relocated if the instruction array expands. */
+                location = ins->location;
                 ret = control_point_normaliser_emit_hs_input(&normaliser, input_signature,
-                        input_control_point_count, i, &ins->location);
+                        input_control_point_count, i, &location);
                 *src_instructions = normaliser.instructions;
                 return ret;
             default:

[PATCH 0/1] MR515: vkd3d-shader/ir: Pass a local copy of location to control_point_normaliser_emit_hs_input(). - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.