diff options
| author | Kenneth Graunke <[email protected]> | 2014-02-03 11:13:48 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-02-07 12:36:38 -0800 |
| commit | 2f97119950515c841bca98a890e5110206bad945 (patch) | |
| tree | 3e5c13eb380910185b274e5332577f5ac8e890ab | |
| parent | 2062f40d81de4743758851b03dad506f9cb6f306 (diff) | |
i965: Fix INTEL_DEBUG=vs for fixed-function/ARB programs.
Since commit 9cee3ff562f3e4b51bfd30338fd1ba7716ac5737, INTEL_DEBUG=vs
has caused a NULL pointer dereference for fixed-function/ARB programs.
In the vec4 generators, "prog" is a gl_program, and "shader_prog" is the
gl_shader_program. This is different than the FS visitor.
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index 94d1e791689..e5ed2c29300 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -1255,7 +1255,7 @@ vec4_generator::generate_code(exec_list *instructions) const void *last_annotation_ir = NULL; if (unlikely(debug_flag)) { - if (prog) { + if (shader_prog) { printf("Native code for vertex shader %d:\n", shader_prog->Name); } else { printf("Native code for vertex program %d:\n", prog->Id); @@ -1271,7 +1271,7 @@ vec4_generator::generate_code(exec_list *instructions) last_annotation_ir = inst->ir; if (last_annotation_ir) { printf(" "); - if (prog) { + if (shader_prog) { ((ir_instruction *) last_annotation_ir)->print(); } else { const prog_instruction *vpi; diff --git a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp index 5a348580b9a..03ed05a0f08 100644 --- a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp @@ -782,7 +782,7 @@ gen8_vec4_generator::generate_code(exec_list *instructions) const void *last_annotation_ir = NULL; if (unlikely(debug_flag)) { - if (prog) { + if (shader_prog) { printf("Native code for vertex shader %d:\n", shader_prog->Name); } else { printf("Native code for vertex program %d:\n", prog->Id); @@ -798,7 +798,7 @@ gen8_vec4_generator::generate_code(exec_list *instructions) last_annotation_ir = ir->ir; if (last_annotation_ir) { printf(" "); - if (prog) { + if (shader_prog) { ((ir_instruction *) last_annotation_ir)->print(); } else { const prog_instruction *vpi; |