i915: Fix INTEL_DEBUG=wm segmentation fault
authorShuang He <shuang.he@intel.com>
Wed, 15 Dec 2010 03:16:49 +0000 (11:16 +0800)
committerEric Anholt <eric@anholt.net>
Thu, 16 Dec 2010 17:01:14 +0000 (09:01 -0800)
The program should be disassembled after it's uploaded

src/mesa/drivers/dri/i915/i915_fragprog.c

index 7a9fb7f088bcfd7c5b90fab3d443782be1820e45..1c6e9845172083c5f274f288ff7c69d0a7026f4d 100644 (file)
@@ -1162,11 +1162,6 @@ translate_program(struct i915_fragment_program *p)
    fixup_depth_write(p);
    i915_fini_program(p);
 
-   if (INTEL_DEBUG & DEBUG_WM) {
-      printf("i915:\n");
-      i915_disassemble_program(i915->state.Program, i915->state.ProgramSize);
-   }
-
    p->translated = 1;
 }
 
@@ -1427,6 +1422,11 @@ i915ValidateFragmentProgram(struct i915_context *i915)
 
    if (!p->on_hardware)
       i915_upload_program(i915, p);
+
+   if (INTEL_DEBUG & DEBUG_WM) {
+      printf("i915:\n");
+      i915_disassemble_program(i915->state.Program, i915->state.ProgramSize);
+   }
 }
 
 void