svn merge ^/branches/released .

2 files changed, 13 insertions, 12 deletions

diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index a3720a24d..5443d8078 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -1124,12 +1124,12 @@ blitframebuffer_texture(struct gl_context *ctx,
       if (readAtt && readAtt->Texture) {

          const struct gl_texture_object *texObj = readAtt->Texture;

          const GLuint srcLevel = readAtt->TextureLevel;

-         const GLenum minFilterSave = texObj->MinFilter;

-         const GLenum magFilterSave = texObj->MagFilter;

+         const GLenum minFilterSave = texObj->Sampler.MinFilter;

+         const GLenum magFilterSave = texObj->Sampler.MagFilter;

          const GLint baseLevelSave = texObj->BaseLevel;

          const GLint maxLevelSave = texObj->MaxLevel;

-         const GLenum wrapSSave = texObj->WrapS;

-         const GLenum wrapTSave = texObj->WrapT;

+         const GLenum wrapSSave = texObj->Sampler.WrapS;

+         const GLenum wrapTSave = texObj->Sampler.WrapT;

          const GLenum target = texObj->Target;

 

          if (drawAtt->Texture == readAtt->Texture) {

@@ -2259,13 +2259,13 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
    struct vertex verts[4];

    const GLuint baseLevel = texObj->BaseLevel;

    const GLuint maxLevel = texObj->MaxLevel;

-   const GLenum minFilterSave = texObj->MinFilter;

-   const GLenum magFilterSave = texObj->MagFilter;

+   const GLenum minFilterSave = texObj->Sampler.MinFilter;

+   const GLenum magFilterSave = texObj->Sampler.MagFilter;

    const GLint maxLevelSave = texObj->MaxLevel;

    const GLboolean genMipmapSave = texObj->GenerateMipmap;

-   const GLenum wrapSSave = texObj->WrapS;

-   const GLenum wrapTSave = texObj->WrapT;

-   const GLenum wrapRSave = texObj->WrapR;

+   const GLenum wrapSSave = texObj->Sampler.WrapS;

+   const GLenum wrapTSave = texObj->Sampler.WrapT;

+   const GLenum wrapRSave = texObj->Sampler.WrapR;

    const GLuint fboSave = ctx->DrawBuffer->Name;

    const GLuint original_active_unit = ctx->Texture.CurrentUnit;

    GLenum faceTarget;

diff --git a/mesalib/src/mesa/drivers/dri/common/texmem.c b/mesalib/src/mesa/drivers/dri/common/texmem.c
index 3c4f3373f..03c15c895 100644
--- a/mesalib/src/mesa/drivers/dri/common/texmem.c
+++ b/mesalib/src/mesa/drivers/dri/common/texmem.c
@@ -1264,17 +1264,18 @@ driCalculateTextureFirstLastLevel( driTextureObject * t )
    case GL_TEXTURE_2D:

    case GL_TEXTURE_3D:

    case GL_TEXTURE_CUBE_MAP:

-      if (tObj->MinFilter == GL_NEAREST || tObj->MinFilter == GL_LINEAR) {

+      if (tObj->Sampler.MinFilter == GL_NEAREST ||

+          tObj->Sampler.MinFilter == GL_LINEAR) {

          /* GL_NEAREST and GL_LINEAR only care about GL_TEXTURE_BASE_LEVEL.

           */

 

          firstLevel = lastLevel = tObj->BaseLevel;

       }

       else {

-	 firstLevel = tObj->BaseLevel + (GLint)(tObj->MinLod + 0.5);

+	 firstLevel = tObj->BaseLevel + (GLint)(tObj->Sampler.MinLod + 0.5);

 	 firstLevel = MAX2(firstLevel, tObj->BaseLevel);

 	 firstLevel = MIN2(firstLevel, tObj->BaseLevel + baseImage->MaxLog2);

-	 lastLevel = tObj->BaseLevel + (GLint)(tObj->MaxLod + 0.5);

+	 lastLevel = tObj->BaseLevel + (GLint)(tObj->Sampler.MaxLod + 0.5);

 	 lastLevel = MAX2(lastLevel, t->tObj->BaseLevel);

 	 lastLevel = MIN2(lastLevel, t->tObj->BaseLevel + baseImage->MaxLog2);

 	 lastLevel = MIN2(lastLevel, t->tObj->MaxLevel);