The kill_emitted variable was duplicating the functionality of
gl_fragment_program::UsesKill. There's no need for both.
---
src/mesa/drivers/dri/i965/brw_fs.h | 1 -
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 4 +---
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
b/src/mesa/drivers/dri/i965/brw_fs.h
index 6e3c46a..031d541 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -373,7 +373,6 @@ public:
int first_non_payload_grf;
int max_grf;
int urb_setup[FRAG_ATTRIB_MAX];
- bool kill_emitted;
/** @{ debug annotation info */
const char *current_annotation;
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index b66e889..1b648aa 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -1400,7 +1400,6 @@ fs_visitor::visit(ir_discard *ir)
assert(ir->condition == NULL); /* FINISHME */
emit(FS_OPCODE_DISCARD);
- kill_emitted = true;
}
void
@@ -2034,7 +2033,7 @@ fs_visitor::emit_fb_writes()
* thread message and on all dual-source messages."
*/
if (intel->gen >= 6 &&
- !this->kill_emitted &&
+ !this->fp->UsesKill &&
!do_dual_src &&
c->key.nr_color_regions == 1) {
header_present = false;
@@ -2230,7 +2229,6 @@ fs_visitor::fs_visitor(struct brw_wm_compile *c, struct
gl_shader_program *prog,
this->virtual_grf_use = NULL;
this->live_intervals_valid = false;
- this->kill_emitted = false;
this->force_uncompressed_stack = 0;
this->force_sechalf_stack = 0;
}
--
1.7.7.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
