From: Jason Ekstrand Date: Tue, 19 Apr 2016 01:51:50 +0000 (-0700) Subject: i965/vec4: Use nir_intrinsic_base in the load_uniform implementation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f16e170fed09821bb1b18a9dbe548f3d26b7977;p=mesa.git i965/vec4: Use nir_intrinsic_base in the load_uniform implementation We shouldn't be reading the const_index directly Reviewed-by: Iago Toral Quiroga Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94998 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95001 --- diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp index e199d9697dc..b5c23c99588 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -691,7 +691,7 @@ vec4_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr) dest = get_nir_dest(instr->dest); - src = src_reg(dst_reg(UNIFORM, instr->const_index[0] / 16)); + src = src_reg(dst_reg(UNIFORM, nir_intrinsic_base(instr) / 16)); src.type = dest.type; /* Uniforms don't actually have to be vec4 aligned. In the case that