From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 29 Aug 2014 18:23:55 +0000 (-0700)
Subject: i965/fs: Don't segfault when debug-logging a null program
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e8f83538dd4203befe63998b703afd2b488ad56a;p=mesa.git

i965/fs: Don't segfault when debug-logging a null program

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 268f52891c2..ac6b1060ecf 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);
       }