Reviewed-by: Iago Toral Quiroga <ito...@igalia.com> On Wed, 2015-09-30 at 18:41 -0700, Jason Ekstrand wrote: > It's not used by anything anymore > --- > src/mesa/drivers/dri/i965/brw_fs.cpp | 14 -------------- > src/mesa/drivers/dri/i965/brw_fs.h | 4 ---- > src/mesa/drivers/dri/i965/brw_shader.h | 4 ---- > src/mesa/drivers/dri/i965/brw_vec4.h | 3 --- > src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 16 ---------------- > 5 files changed, 41 deletions(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp > b/src/mesa/drivers/dri/i965/brw_fs.cpp > index 64215ae..b062219 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs.cpp > +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp > @@ -948,20 +948,6 @@ fs_visitor::import_uniforms(fs_visitor *v) > this->param_size = v->param_size; > } > > -void > -fs_visitor::setup_vec4_uniform_value(unsigned param_offset, > - const gl_constant_value *values, > - unsigned n) > -{ > - static const gl_constant_value zero = { 0 }; > - > - for (unsigned i = 0; i < n; ++i) > - stage_prog_data->param[param_offset + i] = &values[i]; > - > - for (unsigned i = n; i < 4; ++i) > - stage_prog_data->param[param_offset + i] = &zero; > -} > - > fs_reg * > fs_visitor::emit_fragcoord_interpolation(bool pixel_center_integer, > bool origin_upper_left) > diff --git a/src/mesa/drivers/dri/i965/brw_fs.h > b/src/mesa/drivers/dri/i965/brw_fs.h > index a8b6726..6231652 100644 > --- a/src/mesa/drivers/dri/i965/brw_fs.h > +++ b/src/mesa/drivers/dri/i965/brw_fs.h > @@ -294,10 +294,6 @@ public: > > struct brw_reg interp_reg(int location, int channel); > > - virtual void setup_vec4_uniform_value(unsigned param_offset, > - const gl_constant_value *values, > - unsigned n); > - > int implied_mrf_writes(fs_inst *inst); > > virtual void dump_instructions(); > diff --git a/src/mesa/drivers/dri/i965/brw_shader.h > b/src/mesa/drivers/dri/i965/brw_shader.h > index ee6afce..eeb3306 100644 > --- a/src/mesa/drivers/dri/i965/brw_shader.h > +++ b/src/mesa/drivers/dri/i965/brw_shader.h > @@ -269,10 +269,6 @@ public: > void assign_common_binding_table_offsets(uint32_t > next_binding_table_offset); > > virtual void invalidate_live_intervals() = 0; > - > - virtual void setup_vec4_uniform_value(unsigned param_offset, > - const gl_constant_value *values, > - unsigned n) = 0; > }; > > uint32_t brw_texture_offset(int *offsets, unsigned num_components); > diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h > b/src/mesa/drivers/dri/i965/brw_vec4.h > index 76b13a6..b3a62d2 100644 > --- a/src/mesa/drivers/dri/i965/brw_vec4.h > +++ b/src/mesa/drivers/dri/i965/brw_vec4.h > @@ -132,9 +132,6 @@ public: > bool run(); > void fail(const char *msg, ...); > > - virtual void setup_vec4_uniform_value(unsigned param_offset, > - const gl_constant_value *values, > - unsigned n); > int setup_uniforms(int payload_reg); > > bool reg_allocate_trivial(); > diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp > b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp > index af01d8e..bc9d9a0 100644 > --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp > +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp > @@ -688,22 +688,6 @@ dst_reg::dst_reg(class vec4_visitor *v, const struct > glsl_type *type) > this->type = brw_type_for_base_type(type); > } > > -void > -vec4_visitor::setup_vec4_uniform_value(unsigned param_offset, > - const gl_constant_value *values, > - unsigned n) > -{ > - static const gl_constant_value zero = { 0 }; > - > - assert(param_offset % 4 == 0); > - > - for (unsigned i = 0; i < n; ++i) > - stage_prog_data->param[param_offset + i] = &values[i]; > - > - for (unsigned i = n; i < 4; ++i) > - stage_prog_data->param[param_offset + i] = &zero; > -} > - > vec4_instruction * > vec4_visitor::emit_minmax(enum brw_conditional_mod conditionalmod, dst_reg > dst, > src_reg src0, src_reg src1)
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev