X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_state_dump.c;h=e94fa7d2b4c01bf92fcbeda5634dfb5441129502;hb=4dcdf3b9c67f1481d46c1decba84c9c55698db4c;hp=1e8fc972755e1f2f24f967d5ac1d88beb2f6cde4;hpb=e3a6e60040b7f6ea7965e52f8f9881ed31e0347c;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 1e8fc972755..e94fa7d2b4c 100644
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@@ -25,7 +25,7 @@
  *
  */
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "brw_context.h"
 #include "brw_state.h"
@@ -41,13 +41,13 @@
  * \param index Index of the DWORD being output.
  */
 static void
-state_out(char *name, uint32_t *data, uint32_t hw_offset, int index,
+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, data[index]);
+	    name, hw_offset + index * 4, ((uint32_t *)data)[index]);
     va_start(va, fmt);
     vfprintf(stderr, fmt, va);
     va_end(va);
@@ -55,43 +55,143 @@ state_out(char *name, uint32_t *data, uint32_t hw_offset, int index,
 
 /** Generic, undecoded state buffer debug printout */
 static void
-state_struct_out(char *name, dri_bo *buffer, unsigned int pool_offset,
-		 unsigned int state_size)
+state_struct_out(const char *name, dri_bo *buffer, unsigned int state_size)
 {
    int i;
-   uint32_t *state;
 
-   state = buffer->virtual + pool_offset;
+   if (buffer == NULL)
+      return;
+
+   dri_bo_map(buffer, GL_FALSE);
    for (i = 0; i < state_size / 4; i++) {
-      state_out(name, state, buffer->offset + pool_offset, i,
+      state_out(name, buffer->virtual, buffer->offset, i,
 		"dword %d\n", i);
    }
+   dri_bo_unmap(buffer);
+}
+
+static const char *
+get_965_surfacetype(unsigned int surfacetype)
+{
+    switch (surfacetype) {
+    case 0: return "1D";
+    case 1: return "2D";
+    case 2: return "3D";
+    case 3: return "CUBE";
+    case 4: return "BUFFER";
+    case 7: return "NULL";
+    default: return "unknown";
+    }
+}
+
+static const char *
+get_965_surface_format(unsigned int surface_format)
+{
+    switch (surface_format) {
+    case 0x000: return "r32g32b32a32_float";
+    case 0x0c1: return "b8g8r8a8_unorm";
+    case 0x100: return "b5g6r5_unorm";
+    case 0x102: return "b5g5r5a1_unorm";
+    case 0x104: return "b4g4r4a4_unorm";
+    default: return "unknown";
+    }
 }
 
-static void dump_wm_surface_state(struct brw_context *brw, dri_bo *ss_buffer)
+static void dump_wm_surface_state(struct brw_context *brw)
 {
    int i;
 
    for (i = 0; i < brw->wm.nr_surfaces; i++) {
-      unsigned int surfoff = ss_buffer->offset + brw->wm.bind.surf_ss_offset[i];
-      struct brw_surface_state *surf =
-	 (struct brw_surface_state *)(ss_buffer->virtual +
-				      brw->wm.bind.surf_ss_offset[i]);
-      uint32_t *surfvals = (uint32_t *)surf;
+      dri_bo *surf_bo = brw->wm.surf_bo[i];
+      unsigned int surfoff;
+      struct brw_surface_state *surf;
       char name[20];
 
+      if (surf_bo == NULL) {
+	 fprintf(stderr, "  WM SS%d: NULL\n", i);
+	 continue;
+      }
+      dri_bo_map(surf_bo, GL_FALSE);
+      surfoff = surf_bo->offset;
+      surf = (struct brw_surface_state *)(surf_bo->virtual);
+
       sprintf(name, "WM SS%d", i);
-      state_out(name, surfvals, surfoff, 0, "\n");
-      state_out(name, surfvals, surfoff, 1, "offset\n");
-      state_out(name, surfvals, surfoff, 2, "%dx%d size, %d mips\n",
+      state_out(name, surf, surfoff, 0, "%s %s\n",
+		get_965_surfacetype(surf->ss0.surface_type),
+		get_965_surface_format(surf->ss0.surface_format));
+      state_out(name, surf, surfoff, 1, "offset\n");
+      state_out(name, surf, surfoff, 2, "%dx%d size, %d mips\n",
 		surf->ss2.width + 1, surf->ss2.height + 1, surf->ss2.mip_count);
-      state_out(name, surfvals, surfoff, 3, "pitch %d, %stiled\n",
+      state_out(name, surf, surfoff, 3, "pitch %d, %stiled\n",
 		surf->ss3.pitch + 1, surf->ss3.tiled_surface ? "" : "not ");
-      state_out(name, surfvals, surfoff, 4, "mip base %d\n",
+      state_out(name, surf, surfoff, 4, "mip base %d\n",
 		surf->ss4.min_lod);
+      state_out(name, surf, surfoff, 5, "x,y offset: %d,%d\n",
+		surf->ss5.x_offset, surf->ss5.y_offset);
+
+      dri_bo_unmap(surf_bo);
+   }
+}
+
+static void dump_sf_viewport_state(struct brw_context *brw)
+{
+   const char *name = "SF VP";
+   struct brw_sf_viewport *vp;
+   uint32_t vp_off;
+
+   if (brw->sf.vp_bo == NULL)
+      return;
+
+   dri_bo_map(brw->sf.vp_bo, GL_FALSE);
+
+   vp = brw->sf.vp_bo->virtual;
+   vp_off = brw->sf.vp_bo->offset;
+
+   state_out(name, vp, vp_off, 0, "m00 = %f\n", vp->viewport.m00);
+   state_out(name, vp, vp_off, 1, "m11 = %f\n", vp->viewport.m11);
+   state_out(name, vp, vp_off, 2, "m22 = %f\n", vp->viewport.m22);
+   state_out(name, vp, vp_off, 3, "m30 = %f\n", vp->viewport.m30);
+   state_out(name, vp, vp_off, 4, "m31 = %f\n", vp->viewport.m31);
+   state_out(name, vp, vp_off, 5, "m32 = %f\n", vp->viewport.m32);
+
+   state_out(name, vp, vp_off, 6, "top left = %d,%d\n",
+	     vp->scissor.xmin, vp->scissor.ymin);
+   state_out(name, vp, vp_off, 7, "bottom right = %d,%d\n",
+	     vp->scissor.xmax, vp->scissor.ymax);
+
+   dri_bo_unmap(brw->sf.vp_bo);
+}
+
+static void brw_debug_prog(const char *name, dri_bo *prog)
+{
+   unsigned int i;
+   uint32_t *data;
+
+   if (prog == NULL)
+      return;
+
+   dri_bo_map(prog, GL_FALSE);
+
+   data = prog->virtual;
+
+   for (i = 0; i < prog->size / 4 / 4; i++) {
+      fprintf(stderr, "%8s: 0x%08x: 0x%08x 0x%08x 0x%08x 0x%08x\n",
+	      name, (unsigned int)prog->offset + i * 4 * 4,
+	      data[i * 4], data[i * 4 + 1], data[i * 4 + 2], data[i * 4 + 3]);
+      /* Stop at the end of the program.  It'd be nice to keep track of the actual
+       * intended program size instead of guessing like this.
+       */
+      if (data[i * 4 + 0] == 0 &&
+	  data[i * 4 + 1] == 0 &&
+	  data[i * 4 + 2] == 0 &&
+	  data[i * 4 + 3] == 0)
+	 break;
    }
+
+   dri_bo_unmap(prog);
 }
 
+
 /**
  * Print additional debug information associated with the batchbuffer
  * when DEBUG_BATCH is set.
@@ -105,27 +205,20 @@ static void dump_wm_surface_state(struct brw_context *brw, dri_bo *ss_buffer)
 void brw_debug_batch(struct intel_context *intel)
 {
    struct brw_context *brw = brw_context(&intel->ctx);
-   dri_bo *ss_buffer, *gs_buffer;
 
-   ss_buffer = brw->pool[BRW_SS_POOL].buffer;
-   gs_buffer = brw->pool[BRW_GS_POOL].buffer;
+   state_struct_out("WM bind", brw->wm.bind_bo, 4 * brw->wm.nr_surfaces);
+   dump_wm_surface_state(brw);
 
-   dri_bo_map(ss_buffer, GL_FALSE);
-   dri_bo_map(gs_buffer, GL_FALSE);
+   state_struct_out("VS", brw->vs.state_bo, sizeof(struct brw_vs_unit_state));
+   brw_debug_prog("VS prog", brw->vs.prog_bo);
 
-   state_struct_out("WM bind", ss_buffer, brw->wm.bind_ss_offset,
-		    4 * brw->wm.nr_surfaces);
-   dump_wm_surface_state(brw, ss_buffer);
+   state_struct_out("GS", brw->gs.state_bo, sizeof(struct brw_gs_unit_state));
+   brw_debug_prog("GS prog", brw->gs.prog_bo);
 
-   state_struct_out("VS", gs_buffer, brw->vs.state_gs_offset,
-		    sizeof(struct brw_vs_unit_state));
-   state_struct_out("SF", gs_buffer, brw->sf.state_gs_offset,
-		    sizeof(struct brw_sf_unit_state));
-   state_struct_out("SF viewport", gs_buffer, brw->sf.state_gs_offset,
-		    sizeof(struct brw_sf_unit_state));
-   state_struct_out("WM", gs_buffer, brw->wm.state_gs_offset,
-		    sizeof(struct brw_wm_unit_state));
+   state_struct_out("SF", brw->sf.state_bo, sizeof(struct brw_sf_unit_state));
+   dump_sf_viewport_state(brw);
+   brw_debug_prog("SF prog", brw->sf.prog_bo);
 
-   dri_bo_unmap(gs_buffer);
-   dri_bo_unmap(ss_buffer);
+   state_struct_out("WM", brw->wm.state_bo, sizeof(struct brw_wm_unit_state));
+   brw_debug_prog("WM prog", brw->wm.prog_bo);
 }