diff options
author | Eric Anholt <[email protected]> | 2013-09-20 10:13:32 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2013-11-15 11:35:01 -0800 |
commit | e5885c119de1e508099cc1111e1c9f8ff00fab88 (patch) | |
tree | 77232f7a5789900eb180e23fe0f2c1988a70a8f3 /src/mesa/program/program_parse.y | |
parent | bb1f0969756fbb827c4b2520c632daa15342b064 (diff) |
mesa: Dynamically allocate the storage for program local parameters.
The array was 64kb per struct gl_program, plus we statically stored a copy
of one on disk for _mesa_DummyProgram. Given that most struct gl_programs
we generate are for GLSL shaders that don't have local parameters, this
was a waste.
Since you can store and fetch parameters beyond what the program actually
uses, we do have to do a late allocation if necessary at
GetProgramLocalParameter time.
Reduces peak memory usage in the dota2 trace I made by 76MB (4.5%)
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/program/program_parse.y')
-rw-r--r-- | src/mesa/program/program_parse.y | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y index a76db4e86b7..03c0a3dba22 100644 --- a/src/mesa/program/program_parse.y +++ b/src/mesa/program/program_parse.y @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> +#include "main/macros.h" #include "main/mtypes.h" #include "main/imports.h" #include "program/program.h" @@ -2559,6 +2560,12 @@ 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 */ |