From: Brian Paul <brianp@vmware.com>
Date: Fri, 2 Jan 2009 23:15:43 +0000 (-0700)
Subject: gallium: clamp MaxVertexTextureImageUnits against Mesa limit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15a3fdb63e0511860ee84c168b84dd0bcfca6094;p=mesa.git

gallium: clamp MaxVertexTextureImageUnits against Mesa limit
---

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 5ff0c611477..33421149b06 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -91,7 +91,8 @@ void st_init_limits(struct st_context *st)
             MAX_TEXTURE_IMAGE_UNITS);
 
    c->MaxVertexTextureImageUnits
-      = screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS);
+      = _min(screen->get_param(screen, PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS),
+             MAX_VERTEX_TEXTURE_IMAGE_UNITS);
 
    c->MaxDrawBuffers
       = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),