Module: Mesa
Branch: master
Commit: f4276ef7ef4b92bdcb2f43b34ff95a3189fc0ce1
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4276ef7ef4b92bdcb2f43b34ff95a3189fc0ce1
Author: Matt Turner <matts...@gmail.com>
Date: Thu Nov 16 13:35:01 2017 -0800
i965: Move common code out of #ifdef
I'm going to change the call in a later patch and with the difference in
indentation level it wasn't immediately obvious that the calls were
identical.
Reviewed-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
---
src/intel/compiler/brw_fs_generator.cpp | 7 ++-----
src/intel/compiler/brw_vec4_generator.cpp | 6 ++----
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/intel/compiler/brw_fs_generator.cpp
b/src/intel/compiler/brw_fs_generator.cpp
index 46f9a338ea..96691ac3ff 100644
--- a/src/intel/compiler/brw_fs_generator.cpp
+++ b/src/intel/compiler/brw_fs_generator.cpp
@@ -2192,17 +2192,14 @@ fs_generator::generate_code(const cfg_t *cfg, int
dispatch_width)
annotation_finalize(&annotation, p->next_insn_offset);
#ifndef NDEBUG
- bool validated = brw_validate_instructions(devinfo, p->store,
- start_offset,
- p->next_insn_offset,
- &annotation);
+ bool validated =
#else
if (unlikely(debug_flag))
+#endif
brw_validate_instructions(devinfo, p->store,
start_offset,
p->next_insn_offset,
&annotation);
-#endif
int before_size = p->next_insn_offset - start_offset;
brw_compact_instructions(p, start_offset, annotation.ann_count,
diff --git a/src/intel/compiler/brw_vec4_generator.cpp
b/src/intel/compiler/brw_vec4_generator.cpp
index bde4110e54..63831e4ad6 100644
--- a/src/intel/compiler/brw_vec4_generator.cpp
+++ b/src/intel/compiler/brw_vec4_generator.cpp
@@ -2178,15 +2178,13 @@ generate_code(struct brw_codegen *p,
annotation_finalize(&annotation, p->next_insn_offset);
#ifndef NDEBUG
- bool validated = brw_validate_instructions(devinfo, p->store,
- 0, p->next_insn_offset,
- &annotation);
+ bool validated =
#else
if (unlikely(debug_flag))
+#endif
brw_validate_instructions(devinfo, p->store,
0, p->next_insn_offset,
&annotation);
-#endif
int before_size = p->next_insn_offset;
brw_compact_instructions(p, 0, annotation.ann_count, annotation.ann);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
