Module: Mesa
Branch: master
Commit: 8d47b4906bcfb9c73816df5892673c4694410d2f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d47b4906bcfb9c73816df5892673c4694410d2f

Author: Brian Paul <[email protected]>
Date:   Wed Sep 16 15:48:52 2009 -0600

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

---

 src/mesa/swrast/s_texstore.c |   25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/src/mesa/swrast/s_texstore.c b/src/mesa/swrast/s_texstore.c
index f9ff9ad..4f19d19 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);
-   }
 }

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to