nir: make nir_const_value scalar

v2: remove & operator in a couple of memsets
    add some memsets
v3: fixup lima

Signed-off-by: Karol Herbst <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]> (v2)

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gallium/drivers/lima/ir/gp/nir.c b/src/gallium/drivers/lima/ir/gp/nir.c
index 4bb556e294f..8cd8d2f67e0 100644
--- a/src/gallium/drivers/lima/ir/gp/nir.c
+++ b/src/gallium/drivers/lima/ir/gp/nir.c
@@ -217,7 +217,7 @@ static bool gpir_emit_load_const(gpir_block *block, nir_instr *ni)
    assert(instr->def.bit_size == 32);
    assert(instr->def.num_components == 1);
 
-   node->value.i = instr->value.i32[0];
+   node->value.i = instr->value[0].i32;
 
    return true;
 }
diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c
index 5d15668b2a3..669c632b96a 100644
--- a/src/gallium/drivers/lima/ir/pp/nir.c
+++ b/src/gallium/drivers/lima/ir/pp/nir.c
@@ -268,7 +268,7 @@ static ppir_node *ppir_emit_load_const(ppir_block *block, nir_instr *ni)
    assert(instr->def.bit_size == 32);
 
    for (int i = 0; i < instr->def.num_components; i++)
-      node->constant.value[i].i = instr->value.i32[i];
+      node->constant.value[i].i = instr->value[i].i32;
    node->constant.num = instr->def.num_components;
 
    return &node->node;