[Mesa-dev] [PATCH] nir: UBO loads no longer use const_index[1]

[Jason Ekstrand]

LGTM:

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

On Mon, Sep 7, 2015 at 4:52 AM, Iago Toral <itoral at igalia.com> wrote:
> Jason, since that commit is yours, could you review this change? it is a
> one liner.
>
> Thanks,
> Iago
>
> On Tue, 2015-09-01 at 11:32 +0200, Iago Toral Quiroga wrote:
>> 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.
>> ---
>>  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]);
>
>