Module: Mesa
Branch: master
Commit: 2951a9dd51910461ddc736d791584369b06e3d0b
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2951a9dd51910461ddc736d791584369b06e3d0b

Author: Brian Paul <[email protected]>
Date:   Fri Nov  9 14:35:07 2012 -0700

Revert "mesa: assert that key->fragprog_inputs_read value isn't too large"

This reverts commit 0d61f879a1f2e6bb37368731a29d5267e1c25195.

Assigning the FS inputs to the 12 bit field is fine since we don't care
about the higher FS inputs.  Maybe I'll revisit silencing the compiler
warning another day.

---

 src/mesa/main/ffvertex_prog.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 4cdec21..efdca01 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -160,8 +160,6 @@ 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;
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to