From c60a4ba7e36f069d6829948ee14d87970f5f39a1 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 28 Jun 2014 21:16:06 -0700 Subject: [PATCH] i965/disasm: Fix INTEL_DEBUG=fs on Broadwell for ARB_fp applications. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Apparently INTEL_DEBUG=fs has crashed on Broadwell for anything using ARB_fragment_program since commit 9cee3ff5. We need to NULL-check the right field. Signed-off-by: Kenneth Graunke Reviewed-by: Matt Turner Reviewed-by: Kristian Høgsberg Cc: "10.2" --- src/mesa/drivers/dri/i965/gen8_fs_generator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp index 4725774a34e..ac8bf1d4ae4 100644 --- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp @@ -1255,7 +1255,7 @@ gen8_fs_generator::generate_code(exec_list *instructions) int before_size = next_inst_offset - start_offset; if (unlikely(INTEL_DEBUG & DEBUG_WM)) { - if (prog) { + if (shader_prog) { fprintf(stderr, "Native code for %s fragment shader %d (SIMD%d dispatch):\n", shader_prog->Label ? shader_prog->Label : "unnamed", -- 2.30.2