Module: Mesa Branch: master Commit: edd6c4175199a8e1df27e1f3567bb63f7718ce46 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=edd6c4175199a8e1df27e1f3567bb63f7718ce46
Author: Karol Herbst <[email protected]> Date: Sun Aug 5 19:12:48 2018 +0200 nv50/ir: add scalar field to TexInstructions Reviewed-by: Ilia Mirkin <[email protected]> --- src/gallium/drivers/nouveau/codegen/nv50_ir.h | 2 ++ src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h index d5c9570a56..8085bb2f54 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h @@ -1058,6 +1058,8 @@ public: enum TexQuery query; const struct ImgFormatDesc *format; + + bool scalar; // for GM107s TEXS, TLDS, TLD4S } tex; ValueRef dPdx[3]; diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp index 7db9bf0caa..5dcbf3c3e0 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp @@ -612,7 +612,10 @@ void Instruction::print() const if (asFlow()->target.bb) PRINT(" %sBB:%i", colour[TXT_BRA], asFlow()->target.bb->getId()); } else { - PRINT("%s ", operationStr[op]); + if (asTex()) + PRINT("%s%s ", operationStr[op], asTex()->tex.scalar ? "s" : ""); + else + PRINT("%s ", operationStr[op]); if (op == OP_LINTERP || op == OP_PINTERP) PRINT("%s ", interpStr[ipa]); switch (op) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
