i965/disasm: Use Gen6+ SFID case labels.

Most developers will recognize the Gen6+ SFID names more quickly than
the Gen4-5 ones.  Given that they're the same values, just use the new
names.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>

diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index e2f2fd841034a7280401d1802ff79f091ee973ed..b739cc86be9a81a91332d12f7682cd2f758e36bf 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -1310,7 +1310,8 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw, brw_inst *inst,
             string(file, ")");
          }
          break;
-      case BRW_SFID_DATAPORT_READ:
+      case GEN6_SFID_DATAPORT_SAMPLER_CACHE:
+         /* aka BRW_SFID_DATAPORT_READ on Gen4-5 */
          if (brw->gen >= 6) {
             format(file, " (%d, %d, %d, %d)",
                    brw_inst_binding_table_index(brw, inst),
@@ -1325,7 +1326,8 @@ brw_disassemble_inst(FILE *file, struct brw_context *brw, brw_inst *inst,
          }
          break;
 
-      case BRW_SFID_DATAPORT_WRITE:
+      case GEN6_SFID_DATAPORT_RENDER_CACHE:
+         /* aka BRW_SFID_DATAPORT_WRITE on Gen4-5 */
          if (brw->gen >= 7) {
             format(file, " (");