panfrost: Use nir_foreach_variable_with_modes in pan_compile

[mesa.git] / src / gallium / drivers / llvmpipe / lp_tex_sample.c

diff --git a/src/gallium/drivers/llvmpipe/lp_tex_sample.c b/src/gallium/drivers/llvmpipe/lp_tex_sample.c
index a8d18d772d92552bbb6520812ffb35d200ffed9f..72a8b45dda2712786ecdfb7d363681712e68260b 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_tex_sample.c
+++ b/src/gallium/drivers/llvmpipe/lp_tex_sample.c
@@ -94,6 +94,7 @@ struct lp_llvm_image_soa
    struct lp_build_image_soa base;
 
    struct llvmpipe_image_dynamic_state dynamic_state;
+   unsigned nr_images;
 };
 
 
@@ -128,6 +129,11 @@ lp_llvm_texture_member(const struct lp_sampler_dynamic_state *base,
    indices[1] = lp_build_const_int32(gallivm, LP_JIT_CTX_TEXTURES);
    /* context[0].textures[unit] */
    indices[2] = lp_build_const_int32(gallivm, texture_unit);
+   if (texture_unit_offset) {
+      indices[2] = LLVMBuildAdd(gallivm->builder, indices[2], texture_unit_offset, "");
+      LLVMValueRef cond = LLVMBuildICmp(gallivm->builder, LLVMIntULT, indices[2], lp_build_const_int32(gallivm, PIPE_MAX_SHADER_SAMPLER_VIEWS), "");
+      indices[2] = LLVMBuildSelect(gallivm->builder, cond, indices[2], lp_build_const_int32(gallivm, texture_unit), "");
+   }
    /* context[0].textures[unit].member */
    indices[3] = lp_build_const_int32(gallivm, member_index);
 
@@ -275,6 +281,11 @@ lp_llvm_image_member(const struct lp_sampler_dynamic_state *base,
    indices[1] = lp_build_const_int32(gallivm, LP_JIT_CTX_IMAGES);
    /* context[0].images[unit] */
    indices[2] = lp_build_const_int32(gallivm, image_unit);
+   if (image_unit_offset) {
+      indices[2] = LLVMBuildAdd(gallivm->builder, indices[2], image_unit_offset, "");
+      LLVMValueRef cond = LLVMBuildICmp(gallivm->builder, LLVMIntULT, indices[2], lp_build_const_int32(gallivm, PIPE_MAX_SHADER_IMAGES), "");
+      indices[2] = LLVMBuildSelect(gallivm->builder, cond, indices[2], lp_build_const_int32(gallivm, image_unit), "");
+   }
    /* context[0].images[unit].member */
    indices[3] = lp_build_const_int32(gallivm, member_index);
 
@@ -461,9 +472,26 @@ lp_llvm_image_soa_emit_op(const struct lp_build_image_soa *base,
    unsigned image_index = params->image_index;
    assert(image_index < PIPE_MAX_SHADER_IMAGES);
 
-   lp_build_img_op_soa(&image->dynamic_state.static_state[image_index].image_state,
-                       &image->dynamic_state.base,
-                       gallivm, params);
+   if (params->image_index_offset) {
+      struct lp_build_img_op_array_switch switch_info;
+      memset(&switch_info, 0, sizeof(switch_info));
+      LLVMValueRef unit = LLVMBuildAdd(gallivm->builder, params->image_index_offset,
+                                       lp_build_const_int32(gallivm, image_index), "");
+
+      lp_build_image_op_switch_soa(&switch_info, gallivm, params,
+                                   unit, 0, image->nr_images);
+
+      for (unsigned i = 0; i < image->nr_images; i++) {
+         lp_build_image_op_array_case(&switch_info, i,
+                                      &image->dynamic_state.static_state[i].image_state,
+                                      &image->dynamic_state.base);
+      }
+      lp_build_image_op_array_fini_soa(&switch_info);
+   } else {
+      lp_build_img_op_soa(&image->dynamic_state.static_state[image_index].image_state,
+                          &image->dynamic_state.base,
+                          gallivm, params, params->outdata);
+   }
 }
 
 /**
@@ -485,7 +513,8 @@ lp_llvm_image_soa_emit_size_query(const struct lp_build_image_soa *base,
 }
 
 struct lp_build_image_soa *
-lp_llvm_image_soa_create(const struct lp_image_static_state *static_state)
+lp_llvm_image_soa_create(const struct lp_image_static_state *static_state,
+                         unsigned nr_images)
 {
    struct lp_llvm_image_soa *image;
 
@@ -509,5 +538,6 @@ lp_llvm_image_soa_create(const struct lp_image_static_state *static_state)
 
    image->dynamic_state.static_state = static_state;
 
+   image->nr_images = nr_images;
    return &image->base;
 }