Mesa (master): i965/fs: 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: e8f83538dd4203befe63998b703afd2b488ad56a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8f83538dd4203befe63998b703afd2b488ad56a

Author: Jason Ekstrand <jason.ekstrand at intel.com>
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 <jason.ekstrand at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 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);
       }




More information about the mesa-commit mailing list