Module: Mesa Branch: master Commit: e8f83538dd4203befe63998b703afd2b488ad56a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8f83538dd4203befe63998b703afd2b488ad56a
Author: Jason Ekstrand <[email protected]> Date: Fri Aug 29 11:23:55 2014 -0700 i965/fs: 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_fs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 268f528..ac6b106 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -3234,7 +3234,7 @@ fs_visitor::run() if (unlikely(INTEL_DEBUG & DEBUG_OPTIMIZER) && this_progress) { \ char filename[64]; \ snprintf(filename, 64, "fs%d-%04d-%02d-%02d-" #pass, \ - dispatch_width, shader_prog->Name, iteration, pass_num); \ + dispatch_width, shader_prog ? shader_prog->Name : 0, iteration, pass_num); \ \ backend_visitor::dump_instructions(filename); \ } \ @@ -3245,7 +3245,7 @@ fs_visitor::run() if (unlikely(INTEL_DEBUG & DEBUG_OPTIMIZER)) { char filename[64]; snprintf(filename, 64, "fs%d-%04d-00-start", - dispatch_width, shader_prog->Name); + dispatch_width, 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
