diff options
| author | Eric Anholt <[email protected]> | 2013-11-18 09:55:00 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2013-11-20 16:12:46 -0800 |
| commit | 81ff29e30c573fcc134bf717670015ab4654ebcd (patch) | |
| tree | 0ba448cc998e12a38b07b93e2716a7ad00e4a67b /src/mesa/program/program_parse.y | |
| parent | 5fe49d99f250be1aa6080286ff15862ac4d4c903 (diff) | |
mesa: Fix setup of LocalParams array.
i965 passed piglit, but swrast and gallium both segfaulted without this.
i965 happened to work because it never ran _mesa_load_state_parameters()
on the new program before the test called glProgramLocalParameter(), which
was allocating a LocalParams array for the fallback path.
v2: Since v1 threw away old localparams data, leaked old LocalParams
memory, only fixed fragment programs, and I was dubious of my previous
invariants already (nothing but program_parse.y will generate
LocalParams, and only that one path of program_parse.y will), just
late-allocate localparams at the other point of dereferencing them.
This adds overhead to _mesa_load_state_parameter, which is
uncomfortable, but I'm pretty sure that giant switch statement is
super slow already.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71734
Tested-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/mesa/program/program_parse.y')
| -rw-r--r-- | src/mesa/program/program_parse.y | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index 03c0a3dba22..a76db4e86b7 100644 --- a/src/mesa/program/program_parse.y +++ b/src/mesa/program/program_parse.y @@ -25,7 +25,6 @@ #include <stdlib.h> #include <string.h> -#include "main/macros.h" #include "main/mtypes.h" #include "main/imports.h" #include "program/program.h" @@ -2560,12 +2559,6 @@ initialize_symbol_from_param(struct gl_program *prog, param_var->type = at_param; param_var->param_binding_type = PROGRAM_STATE_VAR; - /* Dynamically allocate LocalParams, since it's a large array to have - * statically in every gl_program otherwise. - */ - if (state_tokens[1] == STATE_LOCAL && !prog->LocalParams) - prog->LocalParams = calloc(MAX_PROGRAM_LOCAL_PARAMS, sizeof(float[4])); - /* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements, * we need to unroll it and call add_state_reference() for each row */ |