diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-06-28 21:16:06 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-07-03 18:35:54 -0700 |
| commit | f9718e4b937c95fc08c2fb6239389cfd47851a7e (patch) | |
| tree | e58de1d36f304ce3d67b5375dc0d3ef68dd7868b | |
| parent | 3ca21195939477fa1f9b113ce4f6da36a8480321 (diff) | |
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 <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit c60a4ba7e36f069d6829948ee14d87970f5f39a1)
Conflicts:
src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_fs_generator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp index 26cb991a316..97f6404c036 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", |