Mesa (master): i965/vec4: Don't segfault when debug-logging a null program
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Mon Sep 1 19:34:48 UTC 2014
Module: Mesa
Branch: master
Commit: 1c573c9adbb8bb95bc10f6ade76a430684918160
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c573c9adbb8bb95bc10f6ade76a430684918160
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Wed Aug 27 21:49:50 2014 -0700
i965/vec4: Don't segfault when debug-logging a null program
Signed-off-by: Jason Ekstrand <jason.ekstrand at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_vec4.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index acf0b63..b247bf7 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -1778,7 +1778,7 @@ vec4_visitor::run()
if (unlikely(INTEL_DEBUG & DEBUG_OPTIMIZER) && this_progress) { \
char filename[64]; \
snprintf(filename, 64, "%s-%04d-%02d-%02d-" #pass, \
- stage_name, shader_prog->Name, iteration, pass_num); \
+ stage_name, shader_prog ? shader_prog->Name : 0, iteration, pass_num); \
\
backend_visitor::dump_instructions(filename); \
} \
@@ -1790,7 +1790,7 @@ vec4_visitor::run()
if (unlikely(INTEL_DEBUG & DEBUG_OPTIMIZER)) {
char filename[64];
snprintf(filename, 64, "%s-%04d-00-start",
- stage_name, shader_prog->Name);
+ stage_name, shader_prog ? shader_prog->Name : 0);
backend_visitor::dump_instructions(filename);
}
More information about the mesa-commit
mailing list