diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-02 13:29:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-02 13:29:17 +1000 |
| commit | 81f34e222a4c434e7e5324ed589c76260025ab59 (patch) | |
| tree | 51abec359a7a9e3d06ee7c1dd289545172ae77af /src/mesa/state_tracker/st_extensions.c | |
| parent | 901700888e5b4ec4dbec6ac924b542c780edaf52 (diff) | |
| parent | 7f40115a52ce8f9b5883bd9241707b9e603db0e3 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_extensions.c')
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 3 |
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 7fab4d041d..20f4652413 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -83,7 +83,8 @@ void st_init_limits(struct st_context *st) c->MaxTextureRectSize = min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE); - c->MaxTextureImageUnits + c->MaxTextureUnits + = c->MaxTextureImageUnits = c->MaxTextureCoordUnits = min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS), MAX_TEXTURE_IMAGE_UNITS); |