From: Brian Paul <brianp@vmware.com>
Date: Fri, 9 Nov 2012 21:35:07 +0000 (-0700)
Subject: Revert "mesa: assert that key->fragprog_inputs_read value isn't too large"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2951a9dd51910461ddc736d791584369b06e3d0b;p=mesa.git

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.
---

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 4cdec216696..efdca015e99 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;