X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_state_dump.c;h=8b32810afe935bc013fc618e5024adae86033f44;hb=779923194c65ed3a588d3503cc5d53e1945ada0f;hp=0758cb51a6ad2812e7c7dfe2d41488933b5f8884;hpb=a1226bcd20a582146f1848cc0af8145c53b0ecbc;p=mesa.git

diff --git a/src/mesa/drivers/dri/i965/brw_state_dump.c b/src/mesa/drivers/dri/i965/brw_state_dump.c
index 0758cb51a6a..8b32810afe9 100644
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@@ -30,39 +30,17 @@
 
 #include "brw_context.h"
 #include "brw_defines.h"
+#include "brw_eu.h"
 
 static void
 batch_out(struct brw_context *brw, const char *name, uint32_t offset,
 	  int index, char *fmt, ...) PRINTFLIKE(5, 6);
 
-/**
- * Prints out a header, the contents, and the message associated with
- * the hardware state data given.
- *
- * \param name Name of the state object
- * \param data Pointer to the base of the state object
- * \param hw_offset Hardware offset of the base of the state data.
- * \param index Index of the DWORD being output.
- */
-static void
-state_out(const char *name, void *data, uint32_t hw_offset, int index,
-	  char *fmt, ...)
-{
-    va_list va;
-
-    fprintf(stderr, "%8s: 0x%08x: 0x%08x: ",
-	    name, hw_offset + index * 4, ((uint32_t *)data)[index]);
-    va_start(va, fmt);
-    vfprintf(stderr, fmt, va);
-    va_end(va);
-}
-
 static void
 batch_out(struct brw_context *brw, const char *name, uint32_t offset,
 	  int index, char *fmt, ...)
 {
-   struct intel_context *intel = &brw->intel;
-   uint32_t *data = intel->batch.bo->virtual + offset;
+   uint32_t *data = brw->batch.bo->virtual + offset;
    va_list va;
 
    fprintf(stderr, "0x%08x:      0x%08x: %8s: ",
@@ -72,24 +50,6 @@ batch_out(struct brw_context *brw, const char *name, uint32_t offset,
    va_end(va);
 }
 
-/** Generic, undecoded state buffer debug printout */
-static void
-state_struct_out(const char *name, drm_intel_bo *buffer,
-		 unsigned int offset, unsigned int size)
-{
-   int i;
-
-   if (buffer == NULL)
-      return;
-
-   drm_intel_bo_map(buffer, GL_FALSE);
-   for (i = 0; i < size / 4; i++) {
-      state_out(name, buffer->virtual + offset, buffer->offset + offset, i,
-		"dword %d\n", i);
-   }
-   drm_intel_bo_unmap(buffer);
-}
-
 static const char *
 get_965_surfacetype(unsigned int surfacetype)
 {
@@ -117,10 +77,102 @@ get_965_surface_format(unsigned int surface_format)
     }
 }
 
+static void dump_vs_state(struct brw_context *brw, uint32_t offset)
+{
+   const char *name = "VS_STATE";
+   struct brw_vs_unit_state *vs = brw->batch.bo->virtual + offset;
+
+   batch_out(brw, name, offset, 0, "thread0\n");
+   batch_out(brw, name, offset, 1, "thread1\n");
+   batch_out(brw, name, offset, 2, "thread2\n");
+   batch_out(brw, name, offset, 3, "thread3\n");
+   batch_out(brw, name, offset, 4, "thread4: %d threads\n",
+	     vs->thread4.max_threads + 1);
+   batch_out(brw, name, offset, 5, "vs5\n");
+   batch_out(brw, name, offset, 6, "vs6\n");
+}
+
+static void dump_gs_state(struct brw_context *brw, uint32_t offset)
+{
+   const char *name = "GS_STATE";
+   struct brw_gs_unit_state *gs = brw->batch.bo->virtual + offset;
+
+   batch_out(brw, name, offset, 0, "thread0\n");
+   batch_out(brw, name, offset, 1, "thread1\n");
+   batch_out(brw, name, offset, 2, "thread2\n");
+   batch_out(brw, name, offset, 3, "thread3\n");
+   batch_out(brw, name, offset, 4, "thread4: %d threads\n",
+	     gs->thread4.max_threads + 1);
+   batch_out(brw, name, offset, 5, "vs5\n");
+   batch_out(brw, name, offset, 6, "vs6\n");
+}
+
+static void dump_clip_state(struct brw_context *brw, uint32_t offset)
+{
+   const char *name = "CLIP_STATE";
+   struct brw_clip_unit_state *clip = brw->batch.bo->virtual + offset;
+
+   batch_out(brw, name, offset, 0, "thread0\n");
+   batch_out(brw, name, offset, 1, "thread1\n");
+   batch_out(brw, name, offset, 2, "thread2\n");
+   batch_out(brw, name, offset, 3, "thread3\n");
+   batch_out(brw, name, offset, 4, "thread4: %d threads\n",
+	     clip->thread4.max_threads + 1);
+   batch_out(brw, name, offset, 5, "clip5\n");
+   batch_out(brw, name, offset, 6, "clip6\n");
+   batch_out(brw, name, offset, 7, "vp xmin %f\n", clip->viewport_xmin);
+   batch_out(brw, name, offset, 8, "vp xmax %f\n", clip->viewport_xmax);
+   batch_out(brw, name, offset, 9, "vp ymin %f\n", clip->viewport_ymin);
+   batch_out(brw, name, offset, 10, "vp ymax %f\n", clip->viewport_ymax);
+}
+
+static void dump_sf_state(struct brw_context *brw, uint32_t offset)
+{
+   const char *name = "SF_STATE";
+   struct brw_sf_unit_state *sf = brw->batch.bo->virtual + offset;
+
+   batch_out(brw, name, offset, 0, "thread0\n");
+   batch_out(brw, name, offset, 1, "thread1\n");
+   batch_out(brw, name, offset, 2, "thread2\n");
+   batch_out(brw, name, offset, 3, "thread3\n");
+   batch_out(brw, name, offset, 4, "thread4: %d threads\n",
+	     sf->thread4.max_threads + 1);
+   batch_out(brw, name, offset, 5, "sf5: viewport offset\n");
+   batch_out(brw, name, offset, 6, "sf6\n");
+   batch_out(brw, name, offset, 7, "sf7\n");
+}
+
+static void dump_wm_state(struct brw_context *brw, uint32_t offset)
+{
+   const char *name = "WM_STATE";
+   struct brw_wm_unit_state *wm = brw->batch.bo->virtual + offset;
+
+   batch_out(brw, name, offset, 0, "thread0\n");
+   batch_out(brw, name, offset, 1, "thread1\n");
+   batch_out(brw, name, offset, 2, "thread2\n");
+   batch_out(brw, name, offset, 3, "thread3\n");
+   batch_out(brw, name, offset, 4, "wm4\n");
+   batch_out(brw, name, offset, 5, "wm5: %s%s%s%s%s%s, %d threads\n",
+	     wm->wm5.enable_8_pix ? "8pix" : "",
+	     wm->wm5.enable_16_pix ? "16pix" : "",
+	     wm->wm5.program_uses_depth ? ", uses depth" : "",
+	     wm->wm5.program_computes_depth ? ", computes depth" : "",
+	     wm->wm5.program_uses_killpixel ? ", kills" : "",
+	     wm->wm5.thread_dispatch_enable ? "" : ", no dispatch",
+	     wm->wm5.max_threads + 1);
+   batch_out(brw, name, offset, 6, "depth offset constant %f\n",
+	     wm->global_depth_offset_constant);
+   batch_out(brw, name, offset, 7, "depth offset scale %f\n",
+	     wm->global_depth_offset_scale);
+   batch_out(brw, name, offset, 8, "wm8: kernel 1 (gen5+)\n");
+   batch_out(brw, name, offset, 9, "wm9: kernel 2 (gen5+)\n");
+   batch_out(brw, name, offset, 10, "wm10: kernel 3 (gen5+)\n");
+}
+
 static void dump_surface_state(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "SURF";
-   uint32_t *surf = brw->intel.batch.bo->virtual + offset;
+   uint32_t *surf = brw->batch.bo->virtual + offset;
 
    batch_out(brw, name, offset, 0, "%s %s\n",
 	     get_965_surfacetype(GET_FIELD(surf[0], BRW_SURFACE_TYPE)),
@@ -144,30 +196,39 @@ static void dump_surface_state(struct brw_context *brw, uint32_t offset)
 static void dump_gen7_surface_state(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "SURF";
-   struct gen7_surface_state *surf = brw->intel.batch.bo->virtual + offset;
+   uint32_t *surf = brw->batch.bo->virtual + offset;
 
-   batch_out(brw, name, offset, 0, "%s %s\n",
-	     get_965_surfacetype(surf->ss0.surface_type),
-	     get_965_surface_format(surf->ss0.surface_format));
+   batch_out(brw, name, offset, 0, "%s %s %s\n",
+             get_965_surfacetype(GET_FIELD(surf[0], BRW_SURFACE_TYPE)),
+             get_965_surface_format(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\n",
-	     surf->ss2.width + 1, surf->ss2.height + 1, surf->ss5.mip_count);
+   batch_out(brw, name, offset, 2, "%dx%d size, %d mips, %d slices\n",
+             GET_FIELD(surf[2], GEN7_SURFACE_WIDTH) + 1,
+             GET_FIELD(surf[2], GEN7_SURFACE_HEIGHT) + 1,
+             surf[5] & INTEL_MASK(3, 0),
+             GET_FIELD(surf[3], BRW_SURFACE_DEPTH) + 1);
    batch_out(brw, name, offset, 3, "pitch %d, %stiled\n",
-	     surf->ss3.pitch + 1, surf->ss0.tiled_surface ? "" : "not ");
-   batch_out(brw, name, offset, 4, "mip base %d\n",
-	     surf->ss5.min_lod);
-   batch_out(brw, name, offset, 5, "x,y offset: %d,%d\n",
-	     surf->ss5.x_offset, surf->ss5.y_offset);
+	     (surf[3] & INTEL_MASK(17, 0)) + 1,
+             (surf[0] & (1 << 14)) ? "" : "not ");
+   batch_out(brw, name, offset, 4, "min array element %d, array extent %d\n",
+             GET_FIELD(surf[4], GEN7_SURFACE_MIN_ARRAY_ELEMENT),
+             GET_FIELD(surf[4], GEN7_SURFACE_RENDER_TARGET_VIEW_EXTENT) + 1);
+   batch_out(brw, name, offset, 5, "mip base %d\n",
+             GET_FIELD(surf[5], GEN7_SURFACE_MIN_LOD));
+   batch_out(brw, name, offset, 6, "x,y offset: %d,%d\n",
+             GET_FIELD(surf[5], BRW_SURFACE_X_OFFSET),
+             GET_FIELD(surf[5], BRW_SURFACE_Y_OFFSET));
+   batch_out(brw, name, offset, 7, "\n");
 }
 
 static void
 dump_sdc(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "SDC";
-   struct intel_context *intel = &brw->intel;
 
-   if (intel->gen >= 5 && intel->gen <= 6) {
-      struct gen5_sampler_default_color *sdc = (intel->batch.bo->virtual +
+   if (brw->gen >= 5 && brw->gen <= 6) {
+      struct gen5_sampler_default_color *sdc = (brw->batch.bo->virtual +
 						offset);
       batch_out(brw, name, offset, 0, "unorm rgba\n");
       batch_out(brw, name, offset, 1, "r %f\n", sdc->f[0]);
@@ -182,25 +243,21 @@ dump_sdc(struct brw_context *brw, uint32_t offset)
       batch_out(brw, name, offset, 10, "s16 ba\n");
       batch_out(brw, name, offset, 11, "s8 rgba\n");
    } else {
-      struct brw_sampler_default_color *sdc = (intel->batch.bo->virtual +
-					       offset);
-      batch_out(brw, name, offset, 0, "r %f\n", sdc->color[0]);
-      batch_out(brw, name, offset, 1, "g %f\n", sdc->color[1]);
-      batch_out(brw, name, offset, 2, "b %f\n", sdc->color[2]);
-      batch_out(brw, name, offset, 3, "a %f\n", sdc->color[3]);
+      float *sdc = brw->batch.bo->virtual + offset;
+      batch_out(brw, name, offset, 0, "r %f\n", sdc[0]);
+      batch_out(brw, name, offset, 1, "g %f\n", sdc[1]);
+      batch_out(brw, name, offset, 2, "b %f\n", sdc[2]);
+      batch_out(brw, name, offset, 3, "a %f\n", sdc[3]);
    }
 }
 
 static void dump_sampler_state(struct brw_context *brw,
 			       uint32_t offset, uint32_t size)
 {
-   struct intel_context *intel = &brw->intel;
    int i;
-   struct brw_sampler_state *samp = intel->batch.bo->virtual + offset;
+   uint32_t *samp = brw->batch.bo->virtual + offset;
 
-   assert(intel->gen < 7);
-
-   for (i = 0; i < size / sizeof(*samp); i++) {
+   for (i = 0; i < size / 16; i++) {
       char name[20];
 
       sprintf(name, "WM SAMP%d", i);
@@ -209,44 +266,18 @@ static void dump_sampler_state(struct brw_context *brw,
       batch_out(brw, name, offset, 2, "default color pointer\n");
       batch_out(brw, name, offset, 3, "chroma key, aniso\n");
 
-      samp++;
-      offset += sizeof(*samp);
+      samp += 4;
+      offset += 4 * sizeof(uint32_t);
    }
 }
 
-static void dump_gen7_sampler_state(struct brw_context *brw,
-				    uint32_t offset, uint32_t size)
-{
-   struct intel_context *intel = &brw->intel;
-   struct gen7_sampler_state *samp = intel->batch.bo->virtual + offset;
-   int i;
-
-   assert(intel->gen >= 7);
-
-   for (i = 0; i < size / sizeof(*samp); i++) {
-      char name[20];
-
-      sprintf(name, "WM SAMP%d", i);
-      batch_out(brw, name, offset, 0, "filtering\n");
-      batch_out(brw, name, offset, 1, "wrapping, lod\n");
-      batch_out(brw, name, offset, 2, "default color pointer\n");
-      batch_out(brw, name, offset, 3, "chroma key, aniso\n");
-
-      samp++;
-      offset += sizeof(*samp);
-   }
-   drm_intel_bo_unmap(intel->batch.bo);
-}
-
-
 static void dump_sf_viewport_state(struct brw_context *brw,
 				   uint32_t offset)
 {
-   struct intel_context *intel = &brw->intel;
    const char *name = "SF VP";
-   struct brw_sf_viewport *vp = intel->batch.bo->virtual + offset;
+   struct brw_sf_viewport *vp = brw->batch.bo->virtual + offset;
 
-   assert(intel->gen < 7);
+   assert(brw->gen < 7);
 
    batch_out(brw, name, offset, 0, "m00 = %f\n", vp->viewport.m00);
    batch_out(brw, name, offset, 1, "m11 = %f\n", vp->viewport.m11);
@@ -264,11 +295,10 @@ static void dump_sf_viewport_state(struct brw_context *brw,
 static void dump_clip_viewport_state(struct brw_context *brw,
 				     uint32_t offset)
 {
-   struct intel_context *intel = &brw->intel;
    const char *name = "CLIP VP";
-   struct brw_clipper_viewport *vp = intel->batch.bo->virtual + offset;
+   struct brw_clipper_viewport *vp = brw->batch.bo->virtual + offset;
 
-   assert(intel->gen < 7);
+   assert(brw->gen < 7);
 
    batch_out(brw, name, offset, 0, "xmin = %f\n", vp->xmin);
    batch_out(brw, name, offset, 1, "xmax = %f\n", vp->xmax);
@@ -279,11 +309,10 @@ static void dump_clip_viewport_state(struct brw_context *brw,
 static void dump_sf_clip_viewport_state(struct brw_context *brw,
 					uint32_t offset)
 {
-   struct intel_context *intel = &brw->intel;
    const char *name = "SF_CLIP VP";
-   struct gen7_sf_clip_viewport *vp = intel->batch.bo->virtual + offset;
+   struct gen7_sf_clip_viewport *vp = brw->batch.bo->virtual + offset;
 
-   assert(intel->gen >= 7);
+   assert(brw->gen >= 7);
 
    batch_out(brw, name, offset, 0, "m00 = %f\n", vp->viewport.m00);
    batch_out(brw, name, offset, 1, "m11 = %f\n", vp->viewport.m11);
@@ -301,7 +330,7 @@ static void dump_sf_clip_viewport_state(struct brw_context *brw,
 static void dump_cc_viewport_state(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "CC VP";
-   struct brw_cc_viewport *vp = brw->intel.batch.bo->virtual + offset;
+   struct brw_cc_viewport *vp = brw->batch.bo->virtual + offset;
 
    batch_out(brw, name, offset, 0, "min_depth = %f\n", vp->min_depth);
    batch_out(brw, name, offset, 1, "max_depth = %f\n", vp->max_depth);
@@ -310,7 +339,7 @@ static void dump_cc_viewport_state(struct brw_context *brw, uint32_t offset)
 static void dump_depth_stencil_state(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "D_S";
-   struct gen6_depth_stencil_state *ds = brw->intel.batch.bo->virtual + offset;
+   struct gen6_depth_stencil_state *ds = brw->batch.bo->virtual + offset;
 
    batch_out(brw, name, offset, 0,
 	     "stencil %sable, func %d, write %sable\n",
@@ -327,10 +356,24 @@ static void dump_depth_stencil_state(struct brw_context *brw, uint32_t offset)
 	     ds->ds2.depth_write_enable ? "en" : "dis");
 }
 
-static void dump_cc_state(struct brw_context *brw, uint32_t offset)
+static void dump_cc_state_gen4(struct brw_context *brw, uint32_t offset)
+{
+   const char *name = "CC";
+
+   batch_out(brw, name, offset, 0, "cc0\n");
+   batch_out(brw, name, offset, 1, "cc1\n");
+   batch_out(brw, name, offset, 2, "cc2\n");
+   batch_out(brw, name, offset, 3, "cc3\n");
+   batch_out(brw, name, offset, 4, "cc4: viewport offset\n");
+   batch_out(brw, name, offset, 5, "cc5\n");
+   batch_out(brw, name, offset, 6, "cc6\n");
+   batch_out(brw, name, offset, 7, "cc7\n");
+}
+
+static void dump_cc_state_gen6(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "CC";
-   struct gen6_color_calc_state *cc = brw->intel.batch.bo->virtual + offset;
+   struct gen6_color_calc_state *cc = brw->batch.bo->virtual + offset;
 
    batch_out(brw, name, offset, 0,
 	     "alpha test format %s, round disable %d, stencil ref %d, "
@@ -358,8 +401,7 @@ static void
 dump_scissor(struct brw_context *brw, uint32_t offset)
 {
    const char *name = "SCISSOR";
-   struct intel_context *intel = &brw->intel;
-   struct gen6_scissor_rect *scissor = intel->batch.bo->virtual + offset;
+   struct gen6_scissor_rect *scissor = brw->batch.bo->virtual + offset;
 
    batch_out(brw, name, offset, 0, "xmin %d, ymin %d\n",
 	     scissor->xmin, scissor->ymin);
@@ -371,9 +413,24 @@ static void
 dump_vs_constants(struct brw_context *brw, uint32_t offset, uint32_t size)
 {
    const char *name = "VS_CONST";
-   struct intel_context *intel = &brw->intel;
-   uint32_t *as_uint = intel->batch.bo->virtual + offset;
-   float *as_float = intel->batch.bo->virtual + offset;
+   uint32_t *as_uint = brw->batch.bo->virtual + offset;
+   float *as_float = brw->batch.bo->virtual + offset;
+   int i;
+
+   for (i = 0; i < size / 4; i += 4) {
+      batch_out(brw, name, offset, i, "%3d: (% f % f % f % f) (0x%08x 0x%08x 0x%08x 0x%08x)\n",
+		i / 4,
+		as_float[i], as_float[i + 1], as_float[i + 2], as_float[i + 3],
+		as_uint[i], as_uint[i + 1], as_uint[i + 2], as_uint[i + 3]);
+   }
+}
+
+static void
+dump_wm_constants(struct brw_context *brw, uint32_t offset, uint32_t size)
+{
+   const char *name = "WM_CONST";
+   uint32_t *as_uint = brw->batch.bo->virtual + offset;
+   float *as_float = brw->batch.bo->virtual + offset;
    int i;
 
    for (i = 0; i < size / 4; i += 4) {
@@ -389,7 +446,7 @@ static void dump_binding_table(struct brw_context *brw, uint32_t offset,
 {
    char name[20];
    int i;
-   uint32_t *data = brw->intel.batch.bo->virtual + offset;
+   uint32_t *data = brw->batch.bo->virtual + offset;
 
    for (i = 0; i < size / 4; i++) {
       if (data[i] == 0)
@@ -403,10 +460,8 @@ static void dump_binding_table(struct brw_context *brw, uint32_t offset,
 static void
 dump_prog_cache(struct brw_context *brw)
 {
-   struct intel_context *intel = &brw->intel;
    struct brw_cache *cache = &brw->cache;
-   unsigned int b, i;
-   uint32_t *data;
+   unsigned int b;
 
    drm_intel_bo_map(brw->cache.bo, false);
 
@@ -415,39 +470,34 @@ dump_prog_cache(struct brw_context *brw)
 
       for (item = cache->items[b]; item; item = item->next) {
 	 const char *name;
-	 uint32_t offset = item->offset;
-
-	 data = brw->cache.bo->virtual + item->offset;
 
 	 switch (item->cache_id) {
-	 case BRW_VS_PROG:
+	 case BRW_CACHE_VS_PROG:
 	    name = "VS kernel";
 	    break;
-	 case BRW_GS_PROG:
-	    name = "GS kernel";
+	 case BRW_CACHE_FF_GS_PROG:
+	    name = "Fixed-function GS kernel";
 	    break;
-	 case BRW_CLIP_PROG:
+         case BRW_CACHE_GS_PROG:
+            name = "GS kernel";
+            break;
+	 case BRW_CACHE_CLIP_PROG:
 	    name = "CLIP kernel";
 	    break;
-	 case BRW_SF_PROG:
+	 case BRW_CACHE_SF_PROG:
 	    name = "SF kernel";
 	    break;
-	 case BRW_WM_PROG:
-	    name = "WM kernel";
+	 case BRW_CACHE_FS_PROG:
+	    name = "FS kernel";
 	    break;
 	 default:
 	    name = "unknown";
 	    break;
 	 }
 
-	 for (i = 0; i < item->size / 4 / 4; i++) {
-	    fprintf(stderr, "0x%08x: %8s: 0x%08x 0x%08x 0x%08x 0x%08x ",
-		    offset + i * 4 * 4,
-		    name,
-		    data[i * 4], data[i * 4 + 1], data[i * 4 + 2], data[i * 4 + 3]);
-
-	    brw_disasm(stderr, (void *)(data + i * 4), intel->gen);
-	 }
+         fprintf(stderr, "%s:\n", name);
+         brw_disassemble(brw, brw->cache.bo->virtual, item->offset, item->size,
+                         stderr);
       }
    }
 
@@ -457,7 +507,6 @@ dump_prog_cache(struct brw_context *brw)
 static void
 dump_state_batch(struct brw_context *brw)
 {
-   struct intel_context *intel = &brw->intel;
    int i;
 
    for (i = 0; i < brw->state_batch_count; i++) {
@@ -465,11 +514,26 @@ dump_state_batch(struct brw_context *brw)
       uint32_t size = brw->state_batch_list[i].size;
 
       switch (brw->state_batch_list[i].type) {
+      case AUB_TRACE_VS_STATE:
+	 dump_vs_state(brw, offset);
+	 break;
+      case AUB_TRACE_GS_STATE:
+	 dump_gs_state(brw, offset);
+	 break;
+      case AUB_TRACE_CLIP_STATE:
+	 dump_clip_state(brw, offset);
+	 break;
+      case AUB_TRACE_SF_STATE:
+	 dump_sf_state(brw, offset);
+	 break;
+      case AUB_TRACE_WM_STATE:
+	 dump_wm_state(brw, offset);
+	 break;
       case AUB_TRACE_CLIP_VP_STATE:
 	 dump_clip_viewport_state(brw, offset);
 	 break;
       case AUB_TRACE_SF_VP_STATE:
-	 if (intel->gen >= 7) {
+	 if (brw->gen >= 7) {
 	    dump_sf_clip_viewport_state(brw, offset);
 	 } else {
 	    dump_sf_viewport_state(brw, offset);
@@ -482,7 +546,10 @@ dump_state_batch(struct brw_context *brw)
 	 dump_depth_stencil_state(brw, offset);
 	 break;
       case AUB_TRACE_CC_STATE:
-	 dump_cc_state(brw, offset);
+	 if (brw->gen >= 6)
+	    dump_cc_state_gen6(brw, offset);
+	 else
+	    dump_cc_state_gen4(brw, offset);
 	 break;
       case AUB_TRACE_BLEND_STATE:
 	 dump_blend_state(brw, offset);
@@ -491,18 +558,14 @@ dump_state_batch(struct brw_context *brw)
 	 dump_binding_table(brw, offset, size);
 	 break;
       case AUB_TRACE_SURFACE_STATE:
-	 if (intel->gen < 7) {
+	 if (brw->gen < 7) {
 	    dump_surface_state(brw, offset);
 	 } else {
 	    dump_gen7_surface_state(brw, offset);
 	 }
 	 break;
       case AUB_TRACE_SAMPLER_STATE:
-	 if (intel->gen < 7) {
-	    dump_sampler_state(brw, offset, size);
-	 } else {
-	    dump_gen7_sampler_state(brw, offset, size);
-	 }
+         dump_sampler_state(brw, offset, size);
 	 break;
       case AUB_TRACE_SAMPLER_DEFAULT_COLOR:
 	 dump_sdc(brw, offset);
@@ -513,6 +576,9 @@ dump_state_batch(struct brw_context *brw)
       case AUB_TRACE_VS_CONSTANTS:
 	 dump_vs_constants(brw, offset, size);
 	 break;
+      case AUB_TRACE_WM_CONSTANTS:
+	 dump_wm_constants(brw, offset, size);
+	 break;
       default:
 	 break;
       }
@@ -529,30 +595,11 @@ dump_state_batch(struct brw_context *brw)
  * The buffer offsets printed rely on the buffer containing the last offset
  * it was validated at.
  */
-void brw_debug_batch(struct intel_context *intel)
+void brw_debug_batch(struct brw_context *brw)
 {
-   struct brw_context *brw = brw_context(&intel->ctx);
-
-   if (intel->gen < 6)
-       state_struct_out("VS", intel->batch.bo, brw->vs.state_offset,
-			sizeof(struct brw_vs_unit_state));
-
-   if (intel->gen < 6)
-       state_struct_out("GS", intel->batch.bo, brw->gs.state_offset,
-			sizeof(struct brw_gs_unit_state));
-
-   if (intel->gen < 6) {
-      state_struct_out("SF", intel->batch.bo, brw->sf.state_offset,
-		       sizeof(struct brw_sf_unit_state));
-   }
-
-   if (intel->gen < 6)
-       state_struct_out("WM", intel->batch.bo, brw->wm.state_offset,
-			sizeof(struct brw_wm_unit_state));
-
-   drm_intel_bo_map(intel->batch.bo, false);
+   drm_intel_bo_map(brw->batch.bo, false);
    dump_state_batch(brw);
-   drm_intel_bo_unmap(intel->batch.bo);
+   drm_intel_bo_unmap(brw->batch.bo);
 
    if (0)
       dump_prog_cache(brw);