diff options
| author | Will Dyson <will.dyson@gmail.com> | 2010-06-19 22:04:45 +0200 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2010-06-19 22:09:24 +0200 |
| commit | c674a7eb7fb2fd170df7ff5e3cefdddabda1a03f (patch) | |
| tree | f3b0cbca8e64cffacce10e927265cd6f36621fc7 /src/mesa/drivers/common/meta.c | |
| parent | 9b2ebcaf4b94bfc8756f6b216e0e452013616f2c (diff) | |
Revert "Fix image_matches_texture_obj() MaxLevel check"
This reverts commit a9ee95651131e27d5acf3d10909b5b7e5c8d3e92.
It was based on a failure to understand how ther driver allocates
memory, and causes a regression with Celestia.
Set MaxLevel to dstLevel before allocating new mipmap level.
The radeon driver will fail to allocate space for a new level that
is outside of BaseLevel..MaxLevel. Set MaxLevel before allocating.
Signed-off-by: Maciej Cencora <m.cencora@gmail.com>
Diffstat (limited to 'src/mesa/drivers/common/meta.c')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index fc28685166..3525583382 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2400,6 +2400,9 @@ _mesa_meta_GenerateMipmap(GLcontext *ctx, GLenum target, break; } + /* Set MaxLevel large enough to hold the new level when we allocate it */ + _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel); + /* Create empty dest image */ if (target == GL_TEXTURE_1D) { _mesa_TexImage1D(target, dstLevel, srcImage->InternalFormat, |