projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a57417e)
gallium: clamp MaxVertexTextureImageUnits against Mesa limit
authorBrian Paul <brianp@vmware.com>
Fri, 2 Jan 2009 23:15:43 +0000 (16:15 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 2 Jan 2009 23:16:36 +0000 (16:16 -0700)
src/mesa/state_tracker/st_extensions.c patch | blob | history

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 5ff0c6114774a55a11313e98f4906f2bceaec5dd..33421149b063c8c104b04ae7c1ec851bd4656d3a 100644 (file)
--- 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),