i965/fs: Handle fixed HW GRF subnr in reg_offset().

[mesa.git] / src / mesa / drivers / dri / i965 / brw_state_dump.c

diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c
index b7b0a86f1c7a5d14bb458fe74a77011e1353e59f..6cd61c21fac24fb1b3ce89739af6a796aa685300 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@@ -28,6 +28,8 @@
 #include "main/mtypes.h"
 #include "intel_batchbuffer.h"
 
+#include "isl/isl.h"
+
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_eu.h"
@@ -217,7 +219,7 @@ static void dump_surface_state(struct brw_context *brw, uint32_t offset)
 
    batch_out(brw, name, offset, 0, "%s %s\n",
             get_965_surfacetype(GET_FIELD(surf[0], BRW_SURFACE_TYPE)),
-             brw_surface_format_name(GET_FIELD(surf[0], BRW_SURFACE_FORMAT)));
+             isl_format_get_name(GET_FIELD(surf[0], BRW_SURFACE_FORMAT)));
    batch_out(brw, name, offset, 1, "offset\n");
    batch_out(brw, name, offset, 2, "%dx%d size, %d mips\n",
             GET_FIELD(surf[2], BRW_SURFACE_WIDTH) + 1,
@@ -241,7 +243,7 @@ static void dump_gen7_surface_state(struct brw_context *brw, uint32_t offset)
 
    batch_out(brw, name, offset, 0, "%s %s %s\n",
              get_965_surfacetype(GET_FIELD(surf[0], BRW_SURFACE_TYPE)),
-             brw_surface_format_name(GET_FIELD(surf[0], BRW_SURFACE_FORMAT)),
+             isl_format_get_name(GET_FIELD(surf[0], BRW_SURFACE_FORMAT)),
              (surf[0] & GEN7_SURFACE_IS_ARRAY) ? "array" : "");
    batch_out(brw, name, offset, 1, "offset\n");
    batch_out(brw, name, offset, 2, "%dx%d size, %d mips, %d slices\n",
@@ -298,7 +300,7 @@ dump_gen8_surface_state(struct brw_context *brw, uint32_t offset, int index)
    name = ralloc_asprintf(NULL, "SURF%03d", index);
    batch_out(brw, name, offset, 0, "%s %s %s VALIGN%d HALIGN%d %s\n",
              get_965_surfacetype(GET_FIELD(surf[0], BRW_SURFACE_TYPE)),
-             brw_surface_format_name(GET_FIELD(surf[0], BRW_SURFACE_FORMAT)),
+             isl_format_get_name(GET_FIELD(surf[0], BRW_SURFACE_FORMAT)),
              (surf[0] & GEN7_SURFACE_IS_ARRAY) ? "array" : "",
              1 << (GET_BITS(surf[0], 17, 16) + 1), /* VALIGN */
              1 << (GET_BITS(surf[0], 15, 14) + 1), /* HALIGN */