summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-05-22 10:55:39 -0700
committerEric Anholt <eric@anholt.net>2014-05-22 10:56:50 -0700
commit83923d925dea762847382227607929ca901bc01e (patch)
tree7eb254c2ea26d796dd99c1ac3660127c86431c8f
parent5c01b0360dcb609c8f34a2c95eefd80e8cc4a7d4 (diff)
i965: Fix annotation dumping with non-GLSL programs.compaction
fixes crash in INTEL_DEBUG=vs glxgears. "prog" in the copy-and-paste source was gl_shader_program, while here it's gl_program. squash with: i965: Add annotation data structure and support code."
-rw-r--r--src/mesa/drivers/dri/i965/intel_asm_printer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_asm_printer.c b/src/mesa/drivers/dri/i965/intel_asm_printer.c
index 7904dfc33f6..f533e7cf284 100644
--- a/src/mesa/drivers/dri/i965/intel_asm_printer.c
+++ b/src/mesa/drivers/dri/i965/intel_asm_printer.c
@@ -52,7 +52,7 @@ dump_assembly(void *assembly, int num_annotations, struct annotation *annotation
last_annotation_ir = annotation[i].ir;
if (last_annotation_ir) {
fprintf(stderr, " ");
- if (prog)
+ if (!prog->Instructions)
fprint_ir(stderr, annotation[i].ir);
else {
const struct prog_instruction *pi =