gallium: clamp MaxVertexTextureImageUnits against Mesa limit

2009-01-02 16:15:43 -07:00
parent a57417eff6
commit 15a3fdb63e
1 changed files with 2 additions and 1 deletions
--- 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),