summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-01-02 16:15:43 -0700
committerBrian Paul <brianp@vmware.com>2009-01-02 16:16:36 -0700
commit15a3fdb63e0511860ee84c168b84dd0bcfca6094 (patch)
treec1a35a7c91c62f27668e76298b1c3932a0bcc6fe /src/mesa
parenta57417eff62b24ebc562b6ecc120dfc7448679d0 (diff)
gallium: clamp MaxVertexTextureImageUnits against Mesa limit
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_extensions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 5ff0c61147..33421149b0 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),