diff options
| author | Matt Turner <mattst88@gmail.com> | 2016-07-07 11:48:39 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2016-07-28 11:54:10 -0700 |
| commit | 88501757decd74cbcf04be3b022a4f7054402c13 (patch) | |
| tree | bb6a31a05c66d4b18008f1fc919d16499a7462a0 | |
| parent | e62cd70ea8e87838d9063dcb75d155411436ceda (diff) | |
i965/vec4: Make is_high_sampler a static function.wip/vec4-builder
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 94b5d8de866..5a8275ab255 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -309,8 +309,6 @@ public: void dump_instruction(backend_instruction *inst); void dump_instruction(backend_instruction *inst, FILE *file); - bool is_high_sampler(src_reg sampler); - bool optimize_predicate(nir_alu_instr *instr, enum brw_predicate *predicate); virtual void emit_nir_code(); diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index 9da01fe6037..ffd4a0ee802 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -886,8 +886,8 @@ vec4_visitor::emit_mcs_fetch(const glsl_type *coordinate_type, return src_reg(inst->dst); } -bool -vec4_visitor::is_high_sampler(src_reg sampler) +static bool +is_high_sampler(const struct brw_device_info *devinfo, const src_reg &sampler) { if (devinfo->gen < 8 && !devinfo->is_haswell) return false; @@ -968,7 +968,7 @@ vec4_visitor::emit_texture(ir_texture_opcode op, (devinfo->gen < 5 || devinfo->gen >= 9 || inst->offset != 0 || op == ir_tg4 || op == ir_texture_samples || - is_high_sampler(sampler_reg)) ? 1 : 0; + is_high_sampler(devinfo, sampler_reg)) ? 1 : 0; inst->base_mrf = 2; inst->mlen = inst->header_size; inst->dst.writemask = WRITEMASK_XYZW; |