aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 21f67659c0d..ff0f1a2efa6 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -525,6 +525,17 @@ allocate_full_mipmap(const struct st_texture_object *stObj,
if (stImage->base.Level > 0 || stObj->base.GenerateMipmap)
return TRUE;
+ /* If the application has explicitly called glTextureParameter to set
+ * GL_TEXTURE_MAX_LEVEL, such that (max - base) > 0, then they're trying
+ * to communicate that they will have multiple miplevels.
+ *
+ * Core Mesa will initialize MaxLevel to value much larger than
+ * MAX_TEXTURE_LEVELS, so we check that to see if it's been set at all.
+ */
+ if (stObj->base.MaxLevel < MAX_TEXTURE_LEVELS &&
+ stObj->base.MaxLevel - stObj->base.BaseLevel > 0)
+ return TRUE;
+
if (stImage->base._BaseFormat == GL_DEPTH_COMPONENT ||
stImage->base._BaseFormat == GL_DEPTH_STENCIL_EXT)
/* depth/stencil textures are seldom mipmapped */