Mesa (master): st/mesa: clamp gl_constants::MaxVarying against MAX_VARYING

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep  2 12:58:58 2010 -0600

st/mesa: clamp gl_constants::MaxVarying against MAX_VARYING

Don't try to use more generic varying vars than core Mesa supports.
Fixes fd.o bug 29959.

---

 src/mesa/state_tracker/st_extensions.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 6cd74db..acb9526 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -168,6 +168,7 @@ void st_init_limits(struct st_context *st)
     * subtract the 2 colors to get the maximum number of varyings (generic
     * attributes) supported by a driver. */
    c->MaxVarying = screen->get_param(screen, PIPE_CAP_MAX_FS_INPUTS) - 2;
+   c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);
 }