diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-02 10:53:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-02 10:53:27 +0000 |
| commit | 43fb99508848b8e9f4ced9a7e7a6c3692047fbf1 (patch) | |
| tree | 8cba41c6dda06adfd2a2f88eff6e54ab6d4204cf /mesalib/src/glsl/ast_to_hir.cpp | |
| parent | 717b1a4e21b372e1343e33ae9348fbe5c6f8d7ed (diff) | |
| parent | 56950d7bed70ee82186f44f9333537cdbb33c448 (diff) | |
| download | vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.tar.gz vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.tar.bz2 vcxsrv-43fb99508848b8e9f4ced9a7e7a6c3692047fbf1.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/glsl/ast_to_hir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ast_to_hir.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 27c4301a0..9aad84615 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -3445,11 +3445,9 @@ ast_struct_specifier::hir(exec_list *instructions, if (!state->symbols->add_type(name, t)) {
_mesa_glsl_error(& loc, state, "struct `%s' previously defined", name);
} else {
-
- const glsl_type **s = (const glsl_type **)
- realloc(state->user_structures,
- sizeof(state->user_structures[0]) *
- (state->num_user_structures + 1));
+ const glsl_type **s = reralloc(state, state->user_structures,
+ const glsl_type *,
+ state->num_user_structures + 1);
if (s != NULL) {
s[state->num_user_structures] = t;
state->user_structures = s;
|