From: Brian Paul <brianp@vmware.com>
Date: Wed, 16 Sep 2009 21:48:52 +0000 (-0600)
Subject: swrast: remove mipmap generation checks (done in core Mesa now)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d47b4906bcfb9c73816df5892673c4694410d2f;p=mesa.git

swrast: remove mipmap generation checks (done in core Mesa now)
---

diff --git a/src/mesa/swrast/s_texstore.c b/src/mesa/swrast/s_texstore.c
index f9ff9ad6a42..4f19d19ab12 100644
--- a/src/mesa/swrast/s_texstore.c
+++ b/src/mesa/swrast/s_texstore.c
@@ -299,11 +299,6 @@ _swrast_copy_teximage1d( GLcontext *ctx, GLenum target, GLint level,
                              &ctx->DefaultPacking, texObj, texImage);
       _mesa_free(image);
    }
-
-   /* GL_SGIS_generate_mipmap */
-   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
 }
 
 
@@ -375,11 +370,6 @@ _swrast_copy_teximage2d( GLcontext *ctx, GLenum target, GLint level,
                              &ctx->DefaultPacking, texObj, texImage);
       _mesa_free(image);
    }
-
-   /* GL_SGIS_generate_mipmap */
-   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
 }
 
 
@@ -444,11 +434,6 @@ _swrast_copy_texsubimage1d( GLcontext *ctx, GLenum target, GLint level,
                                 &ctx->DefaultPacking, texObj, texImage);
       _mesa_free(image);
    }
-
-   /* GL_SGIS_generate_mipmap */
-   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
 }
 
 
@@ -520,11 +505,6 @@ _swrast_copy_texsubimage2d( GLcontext *ctx,
                                 &ctx->DefaultPacking, texObj, texImage);
       _mesa_free(image);
    }
-
-   /* GL_SGIS_generate_mipmap */
-   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
 }
 
 
@@ -593,9 +573,4 @@ _swrast_copy_texsubimage3d( GLcontext *ctx,
                                 &ctx->DefaultPacking, texObj, texImage);
       _mesa_free(image);
    }
-
-   /* GL_SGIS_generate_mipmap */
-   if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
-      ctx->Driver.GenerateMipmap(ctx, target, texObj);
-   }
 }