Module: Mesa
Branch: 10.2
Commit: f9718e4b937c95fc08c2fb6239389cfd47851a7e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9718e4b937c95fc08c2fb6239389cfd47851a7e
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Sat Jun 28 21:16:06 2014 -0700
i965/disasm: Fix INTEL_DEBUG=fs on Broadwell for ARB_fp applications.
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 <kenn...@whitecape.org>
Reviewed-by: Matt Turner <matts...@gmail.com>
Reviewed-by: Kristian Høgsberg <k...@bitplanet.net>
Cc: "10.2" <mesa-sta...@lists.freedesktop.org>
(cherry picked from commit c60a4ba7e36f069d6829948ee14d87970f5f39a1)
Conflicts:
src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
---
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 26cb991..97f6404 100644
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -887,7 +887,7 @@ gen8_fs_generator::generate_code(exec_list *instructions)
const void *last_annotation_ir = NULL;
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",
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
