diff options
| author | Bryan Cain <bryancain3@gmail.com> | 2011-06-15 17:31:51 -0500 |
|---|---|---|
| committer | Bryan Cain <bryancain3@gmail.com> | 2011-08-01 17:59:08 -0500 |
| commit | 1141c3f4c4014e3c2834db65b96a3ba7cc78744a (patch) | |
| tree | a21e1fcda00cc07160985d6ae98e261958b84e04 | |
| parent | b30bbd7436bdb9727d3766ba9c07abd610e6dda8 (diff) | |
glsl: remove glsl_type::get_vec4_type()
Thanks to Kenneth Graunke for pointing out that glsl_type::get_instance(base, 4, 1)
is the same as glsl_type::get_vec4_type(base).
The function was only used in st_glsl_to_tgsi, and this commit replaces that usage
with get_instance.
| -rw-r--r-- | src/glsl/glsl_types.h | 15 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index eb9d501858a..1b069df74fe 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -165,21 +165,6 @@ struct glsl_type { static const glsl_type *const mat4x3_type; static const glsl_type *const mat4_type; /*@}*/ - - /** - * Get the built-in instance of the vec4 type for a specific base type - */ - static const glsl_type *get_vec4_type(glsl_base_type base_type) - { - if (base_type == GLSL_TYPE_FLOAT) - return vec4_type; - else if (base_type == GLSL_TYPE_INT) - return ivec4_type; - else if (base_type == GLSL_TYPE_UINT) - return uvec4_type; - else - return NULL; - } /** diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 438f21483c7..5fedf263090 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -1361,7 +1361,7 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir) if (ir->operands[0]->type->is_vector() || ir->operands[1]->type->is_vector()) { st_src_reg temp = get_temp(glsl_version >= 130 ? - glsl_type::get_vec4_type(ir->operands[0]->type->base_type) : + glsl_type::get_instance(ir->operands[0]->type->base_type, 4, 1) : glsl_type::vec4_type); assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT); emit(ir, TGSI_OPCODE_SNE, st_dst_reg(temp), op[0], op[1]); @@ -1376,7 +1376,7 @@ glsl_to_tgsi_visitor::visit(ir_expression *ir) if (ir->operands[0]->type->is_vector() || ir->operands[1]->type->is_vector()) { st_src_reg temp = get_temp(glsl_version >= 130 ? - glsl_type::get_vec4_type(ir->operands[0]->type->base_type) : + glsl_type::get_instance(ir->operands[0]->type->base_type, 4, 1) : glsl_type::vec4_type); assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT); emit(ir, TGSI_OPCODE_SNE, st_dst_reg(temp), op[0], op[1]); |