1 files changed, 22 insertions, 32 deletions

diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
index a395c630cc..0cf4454f25 100644
--- a/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_dump.c
@@ -119,8 +119,7 @@ static const char *TGSI_INTERPOLATES_SHORT[] =
 {
    "CONSTANT",
    "LINEAR",
-   "PERSPECTIVE",
-   "ATTRIB"
+   "PERSPECTIVE"
 };
 
 static const char *TGSI_SEMANTICS[] =
@@ -396,7 +395,8 @@ static const char *TGSI_OPCODES_SHORT[TGSI_OPCODE_LAST] =
    "IFC",
    "BREAKC",
    "KIL",
-   "END"
+   "END",
+   "SWZ"
 };
 
 static const char *TGSI_SATS[] =
@@ -539,6 +539,17 @@ static const char *TGSI_MODULATES[] =
    "MODULATE_EIGHTH"
 };
 
+static const char *TGSI_MODULATES_SHORT[TGSI_MODULATE_COUNT] =
+{
+   "",
+   "_2X",
+   "_4X",
+   "_8X",
+   "_D2",
+   "_D4",
+   "_D8"
+};
+
 void
 tgsi_dump_declaration(
    const struct tgsi_full_declaration  *decl )
@@ -716,7 +727,7 @@ tgsi_dump_instruction(
       TXT( "_SAT" );
       break;
    case TGSI_SAT_MINUS_PLUS_ONE:
-      TXT( "_SAT[-1,1]" );
+      TXT( "_SATNV" );
       break;
    default:
       assert( 0 );
@@ -736,30 +747,7 @@ tgsi_dump_instruction(
       SID( dst->DstRegister.Index );
       CHR( ']' );
 
-      switch (dst->DstRegisterExtModulate.Modulate) {
-      case TGSI_MODULATE_1X:
-         break;
-      case TGSI_MODULATE_2X:
-         TXT( "_2X" );
-         break;
-      case TGSI_MODULATE_4X:
-         TXT( "_4X" );
-         break;
-      case TGSI_MODULATE_8X:
-         TXT( "_8X" );
-         break;
-      case TGSI_MODULATE_HALF:
-         TXT( "_D2" );
-         break;
-      case TGSI_MODULATE_QUARTER:
-         TXT( "_D4" );
-         break;
-      case TGSI_MODULATE_EIGHTH:
-         TXT( "_D8" );
-         break;
-      default:
-         assert( 0 );
-      }
+      ENM( dst->DstRegisterExtModulate.Modulate, TGSI_MODULATES_SHORT );
 
       if( dst->DstRegister.WriteMask != TGSI_WRITEMASK_XYZW ) {
          CHR( '.' );
@@ -805,10 +793,12 @@ tgsi_dump_instruction(
 
       CHR( '[' );
       if (src->SrcRegister.Indirect) {
-         TXT( "addr" );
-         if (src->SrcRegister.Index > 0)
-            CHR( '+' );
-         SID( src->SrcRegister.Index );
+         TXT( "ADDR[0]" );
+         if (src->SrcRegister.Index != 0) {
+            if (src->SrcRegister.Index > 0)
+               CHR( '+' );
+            SID( src->SrcRegister.Index );
+         }
       }
       else
          SID( src->SrcRegister.Index );