[Mesa-stable] [Mesa-dev] [PATCH] nv50/ir: always emit the NDV bit for OP_QUADOP

[Ilia Mirkin]

Although "silences" is more accurate than "fixes".

On Thu, Aug 25, 2016 at 7:05 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
>
> On Thu, Aug 25, 2016 at 12:41 PM, Samuel Pitoiset
> <samuel.pitoiset at gmail.com> wrote:
>> This fixes a divergent error found with F1 2015.
>>
>> GM107 emitter already sets that bit.
>>
>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
>> Cc: <mesa-stable at lists.freedesktop.org>
>> ---
>>  src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp | 5 +----
>>  src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp  | 5 +----
>>  2 files changed, 2 insertions(+), 8 deletions(-)
>>
>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
>> index 501d4af..570b4a9 100644
>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp
>> @@ -1320,16 +1320,13 @@ CodeEmitterGK110::emitTXQ(const TexInstruction *i)
>>  void
>>  CodeEmitterGK110::emitQUADOP(const Instruction *i, uint8_t qOp, uint8_t laneMask)
>>  {
>> -   code[0] = 0x00000002 | ((qOp & 1) << 31);
>> +   code[0] = 0x00000202 | ((qOp & 1) << 31); // dall
>>     code[1] = 0x7fc00000 | (qOp >> 1) | (laneMask << 12);
>>
>>     defId(i->def(0), 2);
>>     srcId(i->src(0), 10);
>>     srcId((i->srcExists(1) && i->predSrc != 1) ? i->src(1) : i->src(0), 23);
>>
>> -   if (i->op == OP_QUADOP && progType != Program::TYPE_FRAGMENT)
>> -      code[1] |= 1 << 9; // dall
>> -
>>     emitPredicate(i);
>>  }
>>
>> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
>> index 8c9b867..d83028c 100644
>> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
>> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
>> @@ -1355,16 +1355,13 @@ CodeEmitterNVC0::emitTXQ(const TexInstruction *i)
>>  void
>>  CodeEmitterNVC0::emitQUADOP(const Instruction *i, uint8_t qOp, uint8_t laneMask)
>>  {
>> -   code[0] = 0x00000000 | (laneMask << 6);
>> +   code[0] = 0x00000200 | (laneMask << 6); // dall
>>     code[1] = 0x48000000 | qOp;
>>
>>     defId(i->def(0), 14);
>>     srcId(i->src(0), 20);
>>     srcId((i->srcExists(1) && i->predSrc != 1) ? i->src(1) : i->src(0), 26);
>>
>> -   if (i->op == OP_QUADOP && progType != Program::TYPE_FRAGMENT)
>> -      code[0] |= 1 << 9; // dall
>> -
>>     emitPredicate(i);
>>  }
>>
>> --
>> 2.8.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev