mesa: Remove EXT_convolution.

More optional code.

1 files changed, 7 insertions, 15 deletions

diff --git a/src/mesa/drivers/dri/unichrome/via_tex.c b/src/mesa/drivers/dri/unichrome/via_tex.c
index a64f093326..01cb3ebbc8 100644
--- a/src/mesa/drivers/dri/unichrome/via_tex.c
+++ b/src/mesa/drivers/dri/unichrome/via_tex.c
@@ -32,7 +32,6 @@
 #include "main/enums.h"
 #include "main/formats.h"
 #include "main/colortab.h"
-#include "main/convolve.h"
 #include "main/context.h"
 #include "main/mipmap.h"
 #include "main/mm.h"
@@ -664,8 +663,6 @@ static void viaTexImage(GLcontext *ctx,
 			struct gl_texture_image *texImage)
 {
    struct via_context *vmesa = VIA_CONTEXT(ctx);
-   GLint postConvWidth = width;
-   GLint postConvHeight = height;
    GLint texelBytes, sizeInBytes;
    struct via_texture_object *viaObj = (struct via_texture_object *)texObj;
    struct via_texture_image *viaImage = (struct via_texture_image *)texImage;
@@ -676,11 +673,6 @@ static void viaTexImage(GLcontext *ctx,
       via_release_pending_textures(vmesa);
    }
 
-   if (ctx->_ImageTransferState & IMAGE_CONVOLUTION_BIT) {
-      _mesa_adjust_image_for_convolution(ctx, dims, &postConvWidth,
-                                         &postConvHeight);
-   }
-
    /* choose the texture format */
    texImage->TexFormat = viaChooseTexFormat(ctx, internalFormat, 
 					    format, type);
@@ -690,13 +682,13 @@ static void viaTexImage(GLcontext *ctx,
    texelBytes = _mesa_get_format_bytes(texImage->TexFormat);
 
    /* Minimum pitch of 32 bytes */
-   if (postConvWidth * texelBytes < 32) {
-      postConvWidth = 32 / texelBytes;
-      texImage->RowStride = postConvWidth;
+   if (width * texelBytes < 32) {
+      width = 32 / texelBytes;
+      texImage->RowStride = width;
    }
 
-   assert(texImage->RowStride == postConvWidth);
-   viaImage->pitchLog2 = logbase2(postConvWidth * texelBytes);
+   assert(texImage->RowStride == width);
+   viaImage->pitchLog2 = logbase2(width * texelBytes);
 
    /* allocate memory */
    if (_mesa_is_format_compressed(texImage->TexFormat))
@@ -705,7 +697,7 @@ static void viaTexImage(GLcontext *ctx,
                                             texImage->Height,
                                             texImage->Depth);
    else
-      sizeInBytes = postConvWidth * postConvHeight * texelBytes;
+      sizeInBytes = width * height * texelBytes;
 
 
    /* Attempt to allocate texture memory directly, otherwise use main
@@ -786,7 +778,7 @@ static void viaTexImage(GLcontext *ctx,
          dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);
       }
       else {
-         dstRowStride = postConvWidth * _mesa_get_format_bytes(texImage->TexFormat);
+         dstRowStride = width * _mesa_get_format_bytes(texImage->TexFormat);
       }
       success = _mesa_texstore(ctx, dims,
                                texImage->_BaseFormat,