summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--builtin_function.cpp45
-rw-r--r--builtin_types.h3
-rw-r--r--glsl_types.h3
-rw-r--r--ir_variable.cpp12
4 files changed, 24 insertions, 39 deletions
diff --git a/builtin_function.cpp b/builtin_function.cpp
index a6e1d370365..c9383e17cc9 100644
--- a/builtin_function.cpp
+++ b/builtin_function.cpp
@@ -296,10 +296,6 @@ make_gentype_function(glsl_symbol_table *symtab, exec_list *instructions,
const glsl_type *type))
{
ir_function *const f = new ir_function(name);
- const glsl_type *float_type = glsl_type::float_type;
- const glsl_type *vec2_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 2, 1);
- const glsl_type *vec3_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 3, 1);
- const glsl_type *vec4_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
bool added = symtab->add_function(name, f);
assert(added);
@@ -307,13 +303,13 @@ make_gentype_function(glsl_symbol_table *symtab, exec_list *instructions,
instructions->push_tail(f);
generate_function_instance(f, name, instructions, n_args, generate,
- float_type, float_type);
+ glsl_type::float_type, glsl_type::float_type);
generate_function_instance(f, name, instructions, n_args, generate,
- vec2_type, vec2_type);
+ glsl_type::vec2_type, glsl_type::vec2_type);
generate_function_instance(f, name, instructions, n_args, generate,
- vec3_type, vec3_type);
+ glsl_type::vec3_type, glsl_type::vec3_type);
generate_function_instance(f, name, instructions, n_args, generate,
- vec4_type, vec4_type);
+ glsl_type::vec4_type, glsl_type::vec4_type);
}
static void
@@ -409,9 +405,6 @@ generate_vec_compare_function(glsl_symbol_table *symtab,
bool do_bool)
{
ir_function *const f = new ir_function(name);
- const glsl_type *vec2_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 2, 1);
- const glsl_type *vec3_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 3, 1);
- const glsl_type *vec4_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
const glsl_type *ivec2_type = glsl_type::get_instance(GLSL_TYPE_INT, 2, 1);
const glsl_type *ivec3_type = glsl_type::get_instance(GLSL_TYPE_INT, 3, 1);
const glsl_type *ivec4_type = glsl_type::get_instance(GLSL_TYPE_INT, 4, 1);
@@ -428,11 +421,11 @@ generate_vec_compare_function(glsl_symbol_table *symtab,
instructions->push_tail(f);
generate_function_instance(f, name, instructions, 2, generate,
- bvec2_type, vec2_type);
+ bvec2_type, glsl_type::vec2_type);
generate_function_instance(f, name, instructions, 2, generate,
- bvec3_type, vec3_type);
+ bvec3_type, glsl_type::vec3_type);
generate_function_instance(f, name, instructions, 2, generate,
- bvec4_type, vec4_type);
+ bvec4_type, glsl_type::vec4_type);
generate_function_instance(f, name, instructions, 2, generate,
bvec2_type, ivec2_type);
@@ -482,10 +475,6 @@ generate_length_functions(glsl_symbol_table *symtab, exec_list *instructions)
{
const char *name = "length";
ir_function *const f = new ir_function(name);
- const glsl_type *float_type = glsl_type::float_type;
- const glsl_type *vec2_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 2, 1);
- const glsl_type *vec3_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 3, 1);
- const glsl_type *vec4_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
bool added = symtab->add_function(name, f);
assert(added);
@@ -493,13 +482,13 @@ generate_length_functions(glsl_symbol_table *symtab, exec_list *instructions)
instructions->push_tail(f);
generate_function_instance(f, name, instructions, 1, generate_length,
- float_type, float_type);
+ glsl_type::float_type, glsl_type::float_type);
generate_function_instance(f, name, instructions, 1, generate_length,
- float_type, vec2_type);
+ glsl_type::float_type, glsl_type::vec2_type);
generate_function_instance(f, name, instructions, 1, generate_length,
- float_type, vec3_type);
+ glsl_type::float_type, glsl_type::vec3_type);
generate_function_instance(f, name, instructions, 1, generate_length,
- float_type, vec4_type);
+ glsl_type::float_type, glsl_type::vec4_type);
}
static void
@@ -524,10 +513,6 @@ generate_dot_functions(glsl_symbol_table *symtab, exec_list *instructions)
{
const char *name = "dot";
ir_function *const f = new ir_function(name);
- const glsl_type *float_type = glsl_type::float_type;
- const glsl_type *vec2_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 2, 1);
- const glsl_type *vec3_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 3, 1);
- const glsl_type *vec4_type = glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
bool added = symtab->add_function(name, f);
assert(added);
@@ -535,13 +520,13 @@ generate_dot_functions(glsl_symbol_table *symtab, exec_list *instructions)
instructions->push_tail(f);
generate_function_instance(f, name, instructions, 2, generate_dot,
- float_type, float_type);
+ glsl_type::float_type, glsl_type::float_type);
generate_function_instance(f, name, instructions, 2, generate_dot,
- float_type, vec2_type);
+ glsl_type::float_type, glsl_type::vec2_type);
generate_function_instance(f, name, instructions, 2, generate_dot,
- float_type, vec3_type);
+ glsl_type::float_type, glsl_type::vec3_type);
generate_function_instance(f, name, instructions, 2, generate_dot,
- float_type, vec4_type);
+ glsl_type::float_type, glsl_type::vec4_type);
}
static void
diff --git a/builtin_types.h b/builtin_types.h
index 73910fd4af0..7f97d6fa86d 100644
--- a/builtin_types.h
+++ b/builtin_types.h
@@ -66,6 +66,9 @@ static const struct glsl_type builtin_core_types[] = {
const glsl_type *const glsl_type::bool_type = & builtin_core_types[0];
const glsl_type *const glsl_type::int_type = & builtin_core_types[4];
const glsl_type *const glsl_type::float_type = & builtin_core_types[8];
+const glsl_type *const glsl_type::vec2_type = & builtin_core_types[9];
+const glsl_type *const glsl_type::vec3_type = & builtin_core_types[10];
+const glsl_type *const glsl_type::vec4_type = & builtin_core_types[11];
const glsl_type *const glsl_type::mat2_type = & builtin_core_types[12];
const glsl_type *const glsl_type::mat3_type = & builtin_core_types[13];
const glsl_type *const glsl_type::mat4_type = & builtin_core_types[14];
diff --git a/glsl_types.h b/glsl_types.h
index 33b1c98158d..c6288683013 100644
--- a/glsl_types.h
+++ b/glsl_types.h
@@ -110,6 +110,9 @@ struct glsl_type {
static const glsl_type *const int_type;
static const glsl_type *const uint_type;
static const glsl_type *const float_type;
+ static const glsl_type *const vec2_type;
+ static const glsl_type *const vec3_type;
+ static const glsl_type *const vec4_type;
static const glsl_type *const bool_type;
/*@}*/
diff --git a/ir_variable.cpp b/ir_variable.cpp
index a2c0803e55a..ba91d566dfc 100644
--- a/ir_variable.cpp
+++ b/ir_variable.cpp
@@ -137,10 +137,8 @@ generate_110_vs_variables(exec_list *instructions,
* FINISHME: value of GL_MAX_TEXTURE_COORDS. GL_MAX_TEXTURE_COORDS must be
* FINISHME: at least 2, so hard-code 2 for now.
*/
- const glsl_type *const vec4_type =
- glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
const glsl_type *const vec4_array_type =
- glsl_type::get_array_instance(vec4_type, 2);
+ glsl_type::get_array_instance(glsl_type::vec4_type, 2);
add_variable("gl_TexCoord", ir_var_out, vec4_array_type, instructions,
symtab);
@@ -219,10 +217,8 @@ generate_110_fs_variables(exec_list *instructions,
* FINISHME: value of GL_MAX_TEXTURE_COORDS. GL_MAX_TEXTURE_COORDS must be
* FINISHME: at least 2, so hard-code 2 for now.
*/
- const glsl_type *const vec4_type =
- glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
const glsl_type *const vec4_array_type =
- glsl_type::get_array_instance(vec4_type, 2);
+ glsl_type::get_array_instance(glsl_type::vec4_type, 2);
add_variable("gl_TexCoord", ir_var_in, vec4_array_type, instructions,
symtab);
@@ -237,10 +233,8 @@ generate_ARB_draw_buffers_fs_variables(exec_list *instructions,
* FINISHME: value of GL_MAX_DRAW_BUFFERS. GL_MAX_DRAW_BUFFERS must be
* FINISHME: at least 1, so hard-code 1 for now.
*/
- const glsl_type *const vec4_type =
- glsl_type::get_instance(GLSL_TYPE_FLOAT, 4, 1);
const glsl_type *const vec4_array_type =
- glsl_type::get_array_instance(vec4_type, 1);
+ glsl_type::get_array_instance(glsl_type::vec4_type, 1);
ir_variable *const fd =
add_variable("gl_FragData", ir_var_out, vec4_array_type, instructions,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 00:37:30 +0000