summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-09-02 12:58:58 -0600
committerBrian Paul <[email protected]>2010-09-02 13:00:10 -0600
commite746a6bb9a6c9f797d1b40ed22b2f296f8fa5aac (patch)
tree0df6004f224470f7fa26df0deead99d997fb2677
parent6e3cbeb3614152ea3aa188666d6166b484ee3f56 (diff)
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.
-rw-r--r--src/mesa/state_tracker/st_extensions.c1
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 6cd74db897b..acb9526c01c 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);
}