diff options
| author | Karol Herbst <[email protected]> | 2018-08-05 19:12:48 +0200 |
|---|---|---|
| committer | Karol Herbst <[email protected]> | 2018-11-06 19:57:05 +0100 |
| commit | edd6c4175199a8e1df27e1f3567bb63f7718ce46 (patch) | |
| tree | a1d674f60a241c2ec0da602993ffe34f573c555b /src/gallium/drivers/nouveau | |
| parent | 8d825f78fc462a551fb4c4e73b55f6eb248793a5 (diff) | |
nv50/ir: add scalar field to TexInstructions
Reviewed-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'src/gallium/drivers/nouveau')
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_print.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h index d5c9570a56b..8085bb2f542 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 7db9bf0caa2..5dcbf3c3e0c 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) { |