fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 23:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

i965: Fix INTEL_DEBUG=vs for fixed-function/ARB programs.

Browse source 
Since commit 9cee3ff562, 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 <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke 2014-02-03 11:13:48 -08:00
parent 2062f40d81
commit 2f97119950
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
View file

@ -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;

4
src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp
View file

@ -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;