Mesa (master): mesa: assert that key->fragprog_inputs_read value isn' t too large
Brian Paul
brianp at kemper.freedesktop.org
Tue Nov 6 15:11:35 UTC 2012
Module: Mesa
Branch: master
Commit: 0d61f879a1f2e6bb37368731a29d5267e1c25195
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d61f879a1f2e6bb37368731a29d5267e1c25195
Author: Brian Paul <brianp at vmware.com>
Date: Sun Nov 4 16:43:44 2012 -0700
mesa: assert that key->fragprog_inputs_read value isn't too large
fragprog_inputs_read is a 12-bit bitfield so check the assigned value.
MSVC warns on the assignment. Not easy to fix but let's do a sanity check.
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
src/mesa/main/ffvertex_prog.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index efdca01..4cdec21 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -160,6 +160,8 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key )
key->need_eye_coords = ctx->_NeedEyeCoords;
+ /* Make sure fp->Base.InputsRead fits in a 12-bit field */
+ assert(fp->Base.InputsRead < (1 << 12));
key->fragprog_inputs_read = fp->Base.InputsRead;
key->varying_vp_inputs = ctx->varying_vp_inputs;
More information about the mesa-commit
mailing list