Mesa (master): tgsi: don't print texture target for sample opcodes

Roland Scheidegger sroland at kemper.freedesktop.org
Tue Sep 16 01:51:07 UTC 2014


Module: Mesa
Branch: master
Commit: 3a9eb40ee16eedb6caff90a8c0c24b7d801063f3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3a9eb40ee16eedb6caff90a8c0c24b7d801063f3

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Sat Sep 13 00:29:56 2014 +0200

tgsi: don't print texture target for sample opcodes

sample opcodes don't encode a texture target, it would thus always
print UNKNOWN, which is not helpful (and wouldn't parse when giving
back the shader text to tgsi).

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/gallium/auxiliary/tgsi/tgsi_dump.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c
index 884d8cf..08d3fde 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
@@ -573,8 +573,11 @@ iter_instruction(
    }
 
    if (inst->Instruction.Texture) {
-      TXT( ", " );
-      ENM( inst->Texture.Texture, tgsi_texture_names );
+      if (!(inst->Instruction.Opcode >= TGSI_OPCODE_SAMPLE &&
+            inst->Instruction.Opcode <= TGSI_OPCODE_GATHER4)) {
+         TXT( ", " );
+         ENM( inst->Texture.Texture, tgsi_texture_names );
+      }
       for (i = 0; i < inst->Texture.NumOffsets; i++) {
          TXT( ", " );
          TXT(tgsi_file_name(inst->TexOffsets[i].File));




More information about the mesa-commit mailing list