[Mesa-dev] [PATCH 2/2] i965/fs: Don't segfault when debug-logging a null program

Jason Ekstrand jason at jlekstrand.net
Mon Sep 1 01:36:16 PDT 2014


---
 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 43aee66..8b76c3e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3046,7 +3046,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);                     \
       }                                                                    \
@@ -3057,7 +3057,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);
       }
-- 
2.1.0



More information about the mesa-dev mailing list