Merge remote-tracking branch 'public/master' into vulkan

[mesa.git] / src / compiler / nir / nir_lower_io.c

diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c
index 6d4a3d8cd894410a6fb9567182f55302ad12f2cb..df1f7a5d76535346d5ef2ff9655c4b7599ea5295 100644 (file)
--- a/src/compiler/nir/nir_lower_io.c
+++ b/src/compiler/nir/nir_lower_io.c
@@ -430,10 +430,13 @@ nir_get_io_offset_src(nir_intrinsic_instr *instr)
    case nir_intrinsic_load_output:
    case nir_intrinsic_load_uniform:
       return &instr->src[0];
    case nir_intrinsic_load_output:
    case nir_intrinsic_load_uniform:
       return &instr->src[0];

+   case nir_intrinsic_load_ubo:
+   case nir_intrinsic_load_ssbo:

    case nir_intrinsic_load_per_vertex_input:
    case nir_intrinsic_load_per_vertex_output:
    case nir_intrinsic_store_output:
       return &instr->src[1];
    case nir_intrinsic_load_per_vertex_input:
    case nir_intrinsic_load_per_vertex_output:
    case nir_intrinsic_store_output:
       return &instr->src[1];

+   case nir_intrinsic_store_ssbo:

    case nir_intrinsic_store_per_vertex_output:
       return &instr->src[2];
    default:
    case nir_intrinsic_store_per_vertex_output:
       return &instr->src[2];
    default: