Module: Mesa Branch: master Commit: 1c573c9adbb8bb95bc10f6ade76a430684918160 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c573c9adbb8bb95bc10f6ade76a430684918160
Author: Jason Ekstrand <[email protected]> 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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> --- 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); } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
