From a07cd42f1e4739000adbbcf5613ba163cf73b666 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 4 Feb 2015 01:40:09 -0800 Subject: [PATCH] i965/fs: Remove type parameter from emit_vs_system_value(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every VS system value has type D. We can always add this back if that changes, but for now, it's extra typing. Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand Reviewed-by: Ian Romanick Reviewed-by: Kristian Høgsberg Reviewed-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index a2e6192c0ee..93754126ed4 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -259,7 +259,7 @@ public: glsl_interp_qualifier interpolation_mode, int location, bool mod_centroid, bool mod_sample); - fs_reg *emit_vs_system_value(enum brw_reg_type type, int location); + fs_reg *emit_vs_system_value(int location); void emit_interpolation_setup_gen4(); void emit_interpolation_setup_gen6(); void compute_sample_position(fs_reg dst, fs_reg int_sample_pos); diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 24cc1187d7f..a2343c6b86f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -51,10 +51,10 @@ extern "C" { fs_reg * -fs_visitor::emit_vs_system_value(enum brw_reg_type type, int location) +fs_visitor::emit_vs_system_value(int location) { fs_reg *reg = new(this->mem_ctx) - fs_reg(ATTR, VERT_ATTRIB_MAX, type); + fs_reg(ATTR, VERT_ATTRIB_MAX, BRW_REGISTER_TYPE_D); brw_vs_prog_data *vs_prog_data = (brw_vs_prog_data *) prog_data; switch (location) { @@ -191,8 +191,7 @@ fs_visitor::visit(ir_variable *ir) case SYSTEM_VALUE_VERTEX_ID: case SYSTEM_VALUE_VERTEX_ID_ZERO_BASE: case SYSTEM_VALUE_INSTANCE_ID: - reg = emit_vs_system_value(brw_type_for_base_type(ir->type), - ir->data.location); + reg = emit_vs_system_value(ir->data.location); break; case SYSTEM_VALUE_SAMPLE_POS: reg = emit_samplepos_setup();