Merge commit 'origin/gallium-0.1' into gallium-0.2

[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 9eb27cc2672e06b65bcdbeccd43bd7330a7740d1..3a93f9f732ea3766482b89172903ba9b7994bd3d 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state_dump.c
+++ b/src/mesa/drivers/dri/i965/brw_state_dump.c
@@ -94,6 +94,10 @@ static void dump_wm_surface_state(struct brw_context *brw)
       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);
@@ -189,8 +193,8 @@ void brw_debug_batch(struct intel_context *intel)
 
    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->vs.prog_bo);
+   brw_debug_prog("SF prog", brw->sf.prog_bo);
 
-   state_struct_out("WM", brw->sf.state_bo, sizeof(struct brw_wm_unit_state));
-   brw_debug_prog("WM prog", brw->vs.prog_bo);
+   state_struct_out("WM", brw->wm.state_bo, sizeof(struct brw_wm_unit_state));
+   brw_debug_prog("WM prog", brw->wm.prog_bo);
 }