diff options
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/gen8_fs_generator.cpp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index d1d271933c6..6ba8bb98295 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -1751,7 +1751,9 @@ fs_generator::generate_code(exec_list *instructions, * we've emitted any discards. If not, this will emit no code. */ if (!patch_discard_jumps_to_fb_writes()) { - annotation->ann_count--; + if (unlikely(debug_flag)) { + annotation->ann_count--; + } } break; diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp index bab1208a217..6755398d042 100644 --- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp @@ -1243,7 +1243,11 @@ gen8_fs_generator::generate_code(exec_list *instructions, /* This is the place where the final HALT needs to be inserted if * we've emitted any discards. If not, this will emit no code. */ - patch_discard_jumps_to_fb_writes(); + if (!patch_discard_jumps_to_fb_writes()) { + if (unlikely(INTEL_DEBUG & DEBUG_WM)) { + annotation->ann_count--; + } + } break; default: |