Module: Mesa Branch: master Commit: 40c0d79d295657f30cb86b002003800844851703 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=40c0d79d295657f30cb86b002003800844851703
Author: Matt Turner <[email protected]> Date: Wed Nov 12 11:09:10 2014 -0800 i965/fs: Remove is_valid_3src(). Reviewed-by: Anuj Phogat <[email protected]> --- src/mesa/drivers/dri/i965/brw_fs.cpp | 6 ------ src/mesa/drivers/dri/i965/brw_fs.h | 1 - src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 4804b7d..054ff2c 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -622,12 +622,6 @@ fs_reg::is_contiguous() const return stride == 1; } -bool -fs_reg::is_valid_3src() const -{ - return file == GRF || file == UNIFORM; -} - int fs_visitor::type_size(const struct glsl_type *type) { diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index c4d8323..d4f663d 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -83,7 +83,6 @@ public: fs_reg(fs_visitor *v, const struct glsl_type *type); bool equals(const fs_reg &r) const; - bool is_valid_3src() const; bool is_contiguous() const; /** Smear a channel of the reg to all channels. */ diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 578e938..b46a8fd 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -514,7 +514,7 @@ fs_visitor::visit(ir_expression *ir) ir->operands[operand]->fprint(stderr); fprintf(stderr, "\n"); } - assert(this->result.is_valid_3src()); + assert(this->result.file == GRF || this->result.file == UNIFORM); op[operand] = this->result; /* Matrix expression operands should have been broken down to vector _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
