aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/uniforms.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-06 15:24:01 +0200
committermarha <marha@users.sourceforge.net>2011-09-06 15:24:01 +0200
commit53da0b7e7c183ea15692234332b3e337b3fb0cc0 (patch)
treefea01c12ceadaeaa091bab7867fa599e55c9fa62 /mesalib/src/mesa/main/uniforms.c
parent6eaea4464631b5d8c1f44a46016163e351028afc (diff)
downloadvcxsrv-53da0b7e7c183ea15692234332b3e337b3fb0cc0.tar.gz
vcxsrv-53da0b7e7c183ea15692234332b3e337b3fb0cc0.tar.bz2
vcxsrv-53da0b7e7c183ea15692234332b3e337b3fb0cc0.zip
mesa git update 6 sep 2011
Diffstat (limited to 'mesalib/src/mesa/main/uniforms.c')
-rw-r--r--mesalib/src/mesa/main/uniforms.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index fe1ce6d7b..b0f9c33b8 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -802,7 +802,10 @@ set_program_uniform(struct gl_context *ctx, struct gl_program *program,
else
uniformVal[i].b = uniformVal[i].u ? 1 : 0;
- if (!ctx->Const.NativeIntegers)
+ if (ctx->Const.NativeIntegers)
+ uniformVal[i].u =
+ uniformVal[i].b ? ctx->Const.UniformBooleanTrue : 0;
+ else
uniformVal[i].f = uniformVal[i].b ? 1.0f : 0.0f;
}
}