struct lp_build_context *uint_bld = &bld_base->uint_bld;
struct lp_build_context *bld_broad = get_int_bld(bld_base, true, bit_size);
LLVMValueRef consts_ptr = lp_build_array_get(gallivm, bld->consts_ptr, index);
+ LLVMValueRef num_consts = lp_build_array_get(gallivm, bld->const_sizes_ptr, index);
unsigned size_shift = bit_size_to_shift_size(bit_size);
if (size_shift)
offset = lp_build_shr(uint_bld, offset, lp_build_const_int_vec(gallivm, uint_bld->type, size_shift));
if (offset_is_uniform && invocation_0_must_be_active(bld_base)) {
offset = LLVMBuildExtractElement(builder, offset, lp_build_const_int32(gallivm, 0), "");
-
+ struct lp_build_context *load_bld = get_int_bld(bld_base, true, bit_size);
+ switch (bit_size) {
+ case 8:
+ num_consts = LLVMBuildShl(gallivm->builder, num_consts, lp_build_const_int32(gallivm, 2), "");
+ break;
+ case 16:
+ num_consts = LLVMBuildShl(gallivm->builder, num_consts, lp_build_const_int32(gallivm, 1), "");
+ break;
+ case 64:
+ num_consts = LLVMBuildLShr(gallivm->builder, num_consts, lp_build_const_int32(gallivm, 1), "");
+ break;
+ default: break;
+ }
for (unsigned c = 0; c < nc; c++) {
- LLVMValueRef this_offset = LLVMBuildAdd(builder, offset, lp_build_const_int32(gallivm, c), "");
+ LLVMValueRef chan_offset = LLVMBuildAdd(builder, offset, lp_build_const_int32(gallivm, c), "");
- LLVMValueRef scalar = lp_build_pointer_get(builder, consts_ptr, this_offset);
- result[c] = lp_build_broadcast_scalar(bld_broad, scalar);
+ LLVMValueRef scalar;
+ /* If loading outside the UBO, we need to skip the load and read 0 instead. */
+ LLVMValueRef zero = lp_build_zero_bits(gallivm, bit_size);
+ LLVMValueRef res_store = lp_build_alloca(gallivm, LLVMTypeOf(zero), "");
+ LLVMBuildStore(builder, zero, res_store);
+
+ LLVMValueRef fetch_extent = LLVMBuildAdd(builder, chan_offset, lp_build_const_int32(gallivm, 1), "");
+ LLVMValueRef fetch_cond = LLVMBuildICmp(gallivm->builder, LLVMIntUGE, num_consts, fetch_extent, "");
+ LLVMValueRef fetch_cond2 = LLVMBuildICmp(gallivm->builder, LLVMIntSGE, chan_offset, lp_build_const_int32(gallivm, 0), "");
+ LLVMValueRef fetch_cond_final = LLVMBuildAnd(gallivm->builder, fetch_cond, fetch_cond2, "");
+ struct lp_build_if_state ifthen;
+ lp_build_if(&ifthen, gallivm, fetch_cond_final);
+ LLVMBuildStore(builder, lp_build_pointer_get(builder, consts_ptr, chan_offset), res_store);
+ lp_build_endif(&ifthen);
+
+ scalar = LLVMBuildLoad(builder, res_store, "");
+
+ result[c] = lp_build_broadcast_scalar(load_bld, scalar);
}
} else {
LLVMValueRef overflow_mask;
- LLVMValueRef num_consts = lp_build_array_get(gallivm, bld->const_sizes_ptr, index);
num_consts = lp_build_broadcast_scalar(uint_bld, num_consts);
if (bit_size == 64)