Mesa (glsl2): glsl2: glsl_type has its own talloc context, don' t pass one in
Ian Romanick
idr at kemper.freedesktop.org
Wed Jul 21 00:52:48 UTC 2010
Module: Mesa
Branch: glsl2
Commit: f38d15b80d4e4c8ecb7a76087cdc49835f0aa271
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f38d15b80d4e4c8ecb7a76087cdc49835f0aa271
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Jul 20 15:33:40 2010 -0700
glsl2: glsl_type has its own talloc context, don't pass one in
---
src/glsl/ast_function.cpp | 3 +--
src/glsl/ast_to_hir.cpp | 5 ++---
src/glsl/glsl_types.cpp | 11 +++++------
src/glsl/glsl_types.h | 5 ++---
src/glsl/ir_reader.cpp | 2 +-
src/glsl/ir_variable.cpp | 17 +++++++----------
6 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 14c36af..73af882 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -312,8 +312,7 @@ process_array_constructor(exec_list *instructions,
if (constructor_type->length == 0) {
constructor_type =
- glsl_type::get_array_instance(state,
- constructor_type->element_type(),
+ glsl_type::get_array_instance(constructor_type->element_type(),
parameter_count);
assert(constructor_type != NULL);
assert(constructor_type->length == parameter_count);
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index c68e136..5cadcd1 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -511,8 +511,7 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
var->max_array_access);
}
- var->type = glsl_type::get_array_instance(state,
- lhs->type->element_type(),
+ var->type = glsl_type::get_array_instance(lhs->type->element_type(),
rhs->type->array_size());
}
}
@@ -1407,7 +1406,7 @@ process_array_type(const glsl_type *base, ast_node *array_size,
}
}
- return glsl_type::get_array_instance(state, base, length);
+ return glsl_type::get_array_instance(base, length);
}
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 5cb327c..de0adc0 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -289,7 +289,7 @@ glsl_type::generate_constructor(glsl_symbol_table *symtab) const
}
-glsl_type::glsl_type(void *ctx, const glsl_type *array, unsigned length) :
+glsl_type::glsl_type(const glsl_type *array, unsigned length) :
base_type(GLSL_TYPE_ARRAY),
sampler_dimensionality(0), sampler_shadow(0), sampler_array(0),
sampler_type(0),
@@ -308,7 +308,7 @@ glsl_type::glsl_type(void *ctx, const glsl_type *array, unsigned length) :
* NUL.
*/
const unsigned name_length = strlen(array->name) + 10 + 3;
- char *const n = (char *) talloc_size(ctx, name_length);
+ char *const n = (char *) talloc_size(this->ctx, name_length);
if (length == 0)
snprintf(n, name_length, "%s[]", array->name);
@@ -411,10 +411,9 @@ glsl_type::array_key_hash(const void *a)
const glsl_type *
-glsl_type::get_array_instance(void *ctx, const glsl_type *base,
- unsigned array_size)
+glsl_type::get_array_instance(const glsl_type *base, unsigned array_size)
{
- const glsl_type key(ctx, base, array_size);
+ const glsl_type key(base, array_size);
if (array_types == NULL) {
array_types = hash_table_ctor(64, array_key_hash, array_key_compare);
@@ -422,7 +421,7 @@ glsl_type::get_array_instance(void *ctx, const glsl_type *base,
const glsl_type *t = (glsl_type *) hash_table_find(array_types, & key);
if (t == NULL) {
- t = new glsl_type(ctx, base, array_size);
+ t = new glsl_type(base, array_size);
hash_table_insert(array_types, (void *) t, t);
}
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index 8ba9b5f..69fb9e3 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -197,8 +197,7 @@ struct glsl_type {
/**
* Get the instance of an array type
*/
- static const glsl_type *get_array_instance(void *ctx,
- const glsl_type *base,
+ static const glsl_type *get_array_instance(const glsl_type *base,
unsigned elements);
/**
@@ -412,7 +411,7 @@ private:
const char *name);
/** Constructor for array types */
- glsl_type(void *ctx, const glsl_type *array, unsigned length);
+ glsl_type(const glsl_type *array, unsigned length);
/** Hash table containing the known array types. */
static struct hash_table *array_types;
diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index ed68496..8b4be41 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -138,7 +138,7 @@ read_type(_mesa_glsl_parse_state *st, s_expression *expr)
return NULL;
}
- return glsl_type::get_array_instance(st, base_type, size->value());
+ return glsl_type::get_array_instance(base_type, size->value());
} else if (strcmp(type_sym->value(), "struct") == 0) {
assert(false); // FINISHME
} else {
diff --git a/src/glsl/ir_variable.cpp b/src/glsl/ir_variable.cpp
index 700c5de..0dd6d83 100644
--- a/src/glsl/ir_variable.cpp
+++ b/src/glsl/ir_variable.cpp
@@ -138,7 +138,7 @@ generate_110_uniforms(exec_list *instructions,
state->Const.MaxFragmentUniformComponents);
const glsl_type *const mat4_array_type =
- glsl_type::get_array_instance(state->symbols, glsl_type::mat4_type,
+ glsl_type::get_array_instance(glsl_type::mat4_type,
state->Const.MaxTextureCoords);
add_variable("gl_TextureMatrix", ir_var_uniform, -1, mat4_array_type,
@@ -157,8 +157,7 @@ generate_110_uniforms(exec_list *instructions,
* FINISHME: at least 8, so hard-code 8 for now.
*/
const glsl_type *const light_source_array_type =
- glsl_type::get_array_instance(state->symbols,
- state->symbols->get_type("gl_LightSourceParameters"), 8);
+ glsl_type::get_array_instance(state->symbols->get_type("gl_LightSourceParameters"), 8);
add_variable("gl_LightSource", ir_var_uniform, -1, light_source_array_type,
instructions, state->symbols);
@@ -196,7 +195,7 @@ generate_110_vs_variables(exec_list *instructions,
* implementation in preserving varying resources."
*/
const glsl_type *const vec4_array_type =
- glsl_type::get_array_instance(state->symbols, glsl_type::vec4_type, 0);
+ glsl_type::get_array_instance(glsl_type::vec4_type, 0);
add_variable("gl_TexCoord", ir_var_out, VERT_RESULT_TEX0, vec4_array_type,
instructions, state->symbols);
@@ -221,7 +220,6 @@ static void
generate_130_vs_variables(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
- void *ctx = state->symbols;
generate_120_vs_variables(instructions, state);
for (unsigned i = 0; i < Elements(builtin_130_vs_variables); i++) {
@@ -233,7 +231,7 @@ generate_130_vs_variables(exec_list *instructions,
* FINISHME: the value of GL_MAX_CLIP_DISTANCES.
*/
const glsl_type *const clip_distance_array_type =
- glsl_type::get_array_instance(ctx, glsl_type::float_type, 8);
+ glsl_type::get_array_instance(glsl_type::float_type, 8);
/* FINISHME: gl_ClipDistance needs a real location assigned. */
add_variable("gl_ClipDistance", ir_var_out, -1, clip_distance_array_type,
@@ -286,7 +284,7 @@ generate_110_fs_variables(exec_list *instructions,
* implementation in preserving varying resources."
*/
const glsl_type *const vec4_array_type =
- glsl_type::get_array_instance(state->symbols, glsl_type::vec4_type, 0);
+ glsl_type::get_array_instance(glsl_type::vec4_type, 0);
add_variable("gl_TexCoord", ir_var_in, FRAG_ATTRIB_TEX0, vec4_array_type,
instructions, state->symbols);
@@ -318,7 +316,7 @@ generate_ARB_draw_buffers_variables(exec_list *instructions,
*/
if (target == fragment_shader) {
const glsl_type *const vec4_array_type =
- glsl_type::get_array_instance(state->symbols, glsl_type::vec4_type,
+ glsl_type::get_array_instance(glsl_type::vec4_type,
state->Const.MaxDrawBuffers);
ir_variable *const fd =
@@ -349,14 +347,13 @@ static void
generate_130_fs_variables(exec_list *instructions,
struct _mesa_glsl_parse_state *state)
{
- void *ctx = state->symbols;
generate_120_fs_variables(instructions, state);
/* FINISHME: The size of this array is implementation dependent based on
* FINISHME: the value of GL_MAX_CLIP_DISTANCES.
*/
const glsl_type *const clip_distance_array_type =
- glsl_type::get_array_instance(ctx, glsl_type::float_type, 8);
+ glsl_type::get_array_instance(glsl_type::float_type, 8);
/* FINISHME: gl_ClipDistance needs a real location assigned. */
add_variable("gl_ClipDistance", ir_var_in, -1, clip_distance_array_type,
More information about the mesa-commit
mailing list