Mesa (master): i915: Fix INTEL_DEBUG=wm segmentation fault

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 2bd11ea11921bcd180b354342a8786c5b7ddd6b3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2bd11ea11921bcd180b354342a8786c5b7ddd6b3

Author: Shuang He <shuang.he at intel.com>
Date:   Wed Dec 15 11:16:49 2010 +0800

i915: Fix INTEL_DEBUG=wm segmentation fault

The program should be disassembled after it's uploaded

---

 src/mesa/drivers/dri/i915/i915_fragprog.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index 7a9fb7f..1c6e984 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -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