diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/program/prog_statevars.c | 14 | ||||
| -rw-r--r-- | src/mesa/program/program_parse.y | 7 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index f6fd53576c1..58e1f496eaa 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -368,6 +368,13 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], COPY_4V(value, ctx->FragmentProgram.Parameters[idx]); return; case STATE_LOCAL: + if (!ctx->FragmentProgram.Current->Base.LocalParams) { + ctx->FragmentProgram.Current->Base.LocalParams = + calloc(MAX_PROGRAM_LOCAL_PARAMS, sizeof(float[4])); + if (!ctx->FragmentProgram.Current->Base.LocalParams) + return; + } + COPY_4V(value, ctx->FragmentProgram.Current->Base.LocalParams[idx]); return; default: @@ -387,6 +394,13 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], COPY_4V(value, ctx->VertexProgram.Parameters[idx]); return; case STATE_LOCAL: + if (!ctx->VertexProgram.Current->Base.LocalParams) { + ctx->VertexProgram.Current->Base.LocalParams = + calloc(MAX_PROGRAM_LOCAL_PARAMS, sizeof(float[4])); + if (!ctx->VertexProgram.Current->Base.LocalParams) + return; + } + COPY_4V(value, ctx->VertexProgram.Current->Base.LocalParams[idx]); return; default: 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 */ |