Mesa (master): nir: UBO loads no longer use const_index[1]

Iago Toral Quiroga itoral at kemper.freedesktop.org
Tue Sep 8 07:08:25 UTC 2015


Module: Mesa
Branch: master
Commit: 205ff843ffa12f461c5307903c200baa1d3c87c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=205ff843ffa12f461c5307903c200baa1d3c87c0

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Tue Sep  1 11:32:29 2015 +0200

nir: UBO loads no longer use const_index[1]

Commit 2126c68e5cba killed the array elements parameter on load/store
intrinsics that was stored in const_index[1]. It looks like that
patch missed to remove this assignment in the UBO path.

Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/glsl/nir/glsl_to_nir.cpp |    1 -
 1 file changed, 1 deletion(-)

diff --git a/src/glsl/nir/glsl_to_nir.cpp b/src/glsl/nir/glsl_to_nir.cpp
index 5fb4ee2..0712908 100644
--- a/src/glsl/nir/glsl_to_nir.cpp
+++ b/src/glsl/nir/glsl_to_nir.cpp
@@ -1001,7 +1001,6 @@ nir_visitor::visit(ir_expression *ir)
       nir_intrinsic_instr *load = nir_intrinsic_instr_create(this->shader, op);
       load->num_components = ir->type->vector_elements;
       load->const_index[0] = const_index ? const_index->value.u[0] : 0; /* base offset */
-      load->const_index[1] = 1; /* number of vec4's */
       load->src[0] = evaluate_rvalue(ir->operands[0]);
       if (!const_index)
          load->src[1] = evaluate_rvalue(ir->operands[1]);




More information about the mesa-commit mailing list