aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/prog_statevars.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-21 08:45:16 +0100
committermarha <marha@users.sourceforge.net>2013-11-21 08:45:16 +0100
commit6e90a0e707aa6d28622f654078f25066bef4dc80 (patch)
treecc95d3e984b2fc4503b5fc8ae731518a8c34fe7c /mesalib/src/mesa/program/prog_statevars.c
parentf75616ac3e99a6bb814803c823cb34533b9fc328 (diff)
parentbb953a87489963f63e65c797a1f2837382ff7808 (diff)
downloadvcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.gz
vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.bz2
vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.zip
Merge remote-tracking branch 'origin/released'
* origin/released: xserver mesa git update 21 nov 2013
Diffstat (limited to 'mesalib/src/mesa/program/prog_statevars.c')
-rw-r--r--mesalib/src/mesa/program/prog_statevars.c14
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: