aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-02-02 16:45:07 -0700
committerBrian <[email protected]>2007-02-02 16:45:07 -0700
commit670e9007196fdabb698e2390dc55c0b26781cff4 (patch)
tree5cf246cd16bd4ae20e35064340dbf6dd4d4076f3
parent31d2a0019249256705ae00984e80b5d768fd3a73 (diff)
clean-ups
-rw-r--r--src/mesa/shader/slang/slang_storage.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/src/mesa/shader/slang/slang_storage.c b/src/mesa/shader/slang/slang_storage.c
index 747d8e1d290..9f824371c52 100644
--- a/src/mesa/shader/slang/slang_storage.c
+++ b/src/mesa/shader/slang/slang_storage.c
@@ -76,14 +76,10 @@ slang_storage_aggregate_push_new(slang_storage_aggregate * agg)
{
slang_storage_array *arr = NULL;
- agg->arrays =
- (slang_storage_array *) slang_alloc_realloc(agg->arrays,
- agg->count *
- sizeof(slang_storage_array),
- (agg->count +
- 1) *
- sizeof
- (slang_storage_array));
+ agg->arrays = (slang_storage_array *)
+ slang_alloc_realloc(agg->arrays,
+ agg->count * sizeof(slang_storage_array),
+ (agg->count + 1) * sizeof(slang_storage_array));
if (agg->arrays != NULL) {
arr = agg->arrays + agg->count;
if (!slang_storage_array_construct(arr))
@@ -131,6 +127,7 @@ aggregate_matrix(slang_storage_aggregate * agg, slang_storage_type basic_type,
return GL_TRUE;
}
+
static GLboolean
aggregate_variables(slang_storage_aggregate * agg,
slang_variable_scope * vars, slang_function_scope * funcs,
@@ -148,6 +145,7 @@ aggregate_variables(slang_storage_aggregate * agg,
return GL_TRUE;
}
+
GLboolean
_slang_aggregate_variable(slang_storage_aggregate * agg,
slang_type_specifier * spec, GLuint array_len,
@@ -227,7 +225,6 @@ _slang_aggregate_variable(slang_storage_aggregate * agg,
}
}
-/* _slang_sizeof_type() */
GLuint
_slang_sizeof_type(slang_storage_type type)
@@ -239,7 +236,6 @@ _slang_sizeof_type(slang_storage_type type)
return sizeof(GLfloat);
}
-/* _slang_sizeof_aggregate() */
GLuint
_slang_sizeof_aggregate(const slang_storage_aggregate * agg)
@@ -259,7 +255,6 @@ _slang_sizeof_aggregate(const slang_storage_aggregate * agg)
return size;
}
-/* _slang_flatten_aggregate () */
GLboolean
_slang_flatten_aggregate(slang_storage_aggregate * flat,