diff options
| author | Paul Berry <[email protected]> | 2012-07-18 23:20:23 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-07-20 09:33:07 -0700 |
| commit | 9544e44262651a51ffdb3a572f99f902807a6205 (patch) | |
| tree | a8f8c6b8d5ac5e5b3e1ea16054c00f57dc34a659 /src/mesa/drivers | |
| parent | 0f1f2ff8db8c19be27b9f51f07134091e109e4b2 (diff) | |
i965: Replace fs_visitor::kill_emitted with gl_fragment_program::UsesKill.
The kill_emitted variable was duplicating the functionality of
gl_fragment_program::UsesKill. There's no need for both.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.h | 1 | ||||
| -rw-r--r-- | 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 6e3c46a39ea..031d5414ba1 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 b66e889fc03..1b648aaa0bd 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; } |