From f6d1847eef027266daa0f75ee92ceb09698b2761 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 29 Jun 2012 09:50:56 +0200
Subject: xkeyboard-config xserver pixman mesa git update 29 Jun 2012

---
 mesalib/src/mesa/state_tracker/st_extensions.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mesalib/src/mesa/state_tracker/st_extensions.c')

diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index dacad9bfb..6fea1fa08 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -236,8 +236,9 @@ void st_init_limits(struct st_context *st)
 
    c->UniformBooleanTrue = ~0;
 
-   c->MaxTransformFeedbackSeparateAttribs =
+   c->MaxTransformFeedbackBuffers =
       screen->get_param(screen, PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS);
+   c->MaxTransformFeedbackBuffers = MIN2(c->MaxTransformFeedbackBuffers, MAX_FEEDBACK_BUFFERS);
    c->MaxTransformFeedbackSeparateComponents =
       screen->get_param(screen, PIPE_CAP_MAX_STREAM_OUTPUT_SEPARATE_COMPONENTS);
    c->MaxTransformFeedbackInterleavedComponents =
-- 
cgit v1.2.3