diff options
author | marha <marha@users.sourceforge.net> | 2013-11-21 08:43:25 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-21 08:43:25 +0100 |
commit | bb953a87489963f63e65c797a1f2837382ff7808 (patch) | |
tree | 458f44ffc1539fad170d96a414970a42b75d1190 /mesalib/src/mesa/program/prog_statevars.c | |
parent | 73db05c85f7a8cf2439f7c333ede6ff2dc4877d7 (diff) | |
download | vcxsrv-bb953a87489963f63e65c797a1f2837382ff7808.tar.gz vcxsrv-bb953a87489963f63e65c797a1f2837382ff7808.tar.bz2 vcxsrv-bb953a87489963f63e65c797a1f2837382ff7808.zip |
xserver mesa git update 21 nov 2013
xserver commit 6403cbb143c67872ca9c58e3116ae7942def0ae1
mesa commit b7c0b61782251c1dedb0b0fb0e6654af81249910
Diffstat (limited to 'mesalib/src/mesa/program/prog_statevars.c')
-rw-r--r-- | mesalib/src/mesa/program/prog_statevars.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c index f6fd53576..58e1f496e 100644 --- a/mesalib/src/mesa/program/prog_statevars.c +++ b/mesalib/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: |