svn merge ^/branches/released .

1 files changed, 2 insertions, 5 deletions

diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index b2cd8dca7..9c0507bc2 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -2260,7 +2260,6 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
    const GLuint maxLevel = texObj->MaxLevel;

    const GLenum minFilterSave = texObj->MinFilter;

    const GLenum magFilterSave = texObj->MagFilter;

-   const GLint baseLevelSave = texObj->BaseLevel;

    const GLint maxLevelSave = texObj->MaxLevel;

    const GLboolean genMipmapSave = texObj->GenerateMipmap;

    const GLenum wrapSSave = texObj->WrapS;

@@ -2320,7 +2319,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
    }

    _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);

 

-   _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

+   _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);

    _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

    _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);

    _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

@@ -2496,8 +2495,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
          }

       }

 

-      /* limit sampling to src level */

-      _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, srcLevel);

+      /* limit minification to src level */

       _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);

 

       /* Set to draw into the current dstLevel */

@@ -2549,7 +2547,6 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
 

    _mesa_TexParameteri(target, GL_TEXTURE_MIN_FILTER, minFilterSave);

    _mesa_TexParameteri(target, GL_TEXTURE_MAG_FILTER, magFilterSave);

-   _mesa_TexParameteri(target, GL_TEXTURE_BASE_LEVEL, baseLevelSave);

    _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);

    _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);

    _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, wrapSSave);