Module: Mesa Branch: master Commit: f4d2d491522aea8c7de46311c3f5e9c588307dd2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4d2d491522aea8c7de46311c3f5e9c588307dd2
Author: Samuel Pitoiset <[email protected]> Date: Sun Feb 28 22:43:50 2016 +0100 gk110/ir: allow to emit immediates for BAR Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> --- .../drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 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 0e7a237..e5d638b 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_gk110.cpp @@ -1279,8 +1279,27 @@ CodeEmitterGK110::emitBAR(const Instruction *i) emitPredicate(i); - srcId(i->src(0), 10); - srcId(i->src(1), 23); + // barrier id + if (i->src(0).getFile() == FILE_GPR) { + srcId(i->src(0), 10); + } else { + ImmediateValue *imm = i->getSrc(0)->asImm(); + assert(imm); + code[0] |= imm->reg.data.u32 << 10; + code[1] |= 0x8000; + } + + // thread count + if (i->src(1).getFile() == FILE_GPR) { + srcId(i->src(1), 23); + } else { + ImmediateValue *imm = i->getSrc(0)->asImm(); + assert(imm); + assert(imm->reg.data.u32 <= 0xfff); + code[0] |= imm->reg.data.u32 << 23; + code[1] |= imm->reg.data.u32 >> 9; + code[1] |= 0x4000; + } } void CodeEmitterGK110::emitMEMBAR(const Instruction *i) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
