From: Eric Anholt <eric@anholt.net>
Date: Tue, 30 Aug 2011 17:33:23 +0000 (-0700)
Subject: intel: Remove the passthrough TexSubImage[13]D functions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b26a08402f645aebadfabc91e08eac568e1a40c3;p=mesa.git

intel: Remove the passthrough TexSubImage[13]D functions.

All we need for these is _mesa_store_texsubimage[13]d(), since we
don't do the blit path.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index 49c8ae9c347..851b09e6454 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
@@ -148,27 +148,6 @@ intelTexSubimage(struct gl_context * ctx,
 			     packing, texObj, texImage);
 }
 
-
-static void
-intelTexSubImage3D(struct gl_context * ctx,
-                   GLenum target,
-                   GLint level,
-                   GLint xoffset, GLint yoffset, GLint zoffset,
-                   GLsizei width, GLsizei height, GLsizei depth,
-                   GLenum format, GLenum type,
-                   const GLvoid * pixels,
-                   const struct gl_pixelstore_attrib *packing,
-                   struct gl_texture_object *texObj,
-                   struct gl_texture_image *texImage)
-{
-   intelTexSubimage(ctx, 3,
-                    target, level,
-                    xoffset, yoffset, zoffset,
-                    width, height, depth, 0,
-                    format, type, pixels, packing, texObj, texImage);
-}
-
-
 static void
 intelTexSubImage2D(struct gl_context * ctx,
                    GLenum target,
@@ -189,29 +168,8 @@ intelTexSubImage2D(struct gl_context * ctx,
 }
 
 
-static void
-intelTexSubImage1D(struct gl_context * ctx,
-                   GLenum target,
-                   GLint level,
-                   GLint xoffset,
-                   GLsizei width,
-                   GLenum format, GLenum type,
-                   const GLvoid * pixels,
-                   const struct gl_pixelstore_attrib *packing,
-                   struct gl_texture_object *texObj,
-                   struct gl_texture_image *texImage)
-{
-   intelTexSubimage(ctx, 1,
-                    target, level,
-                    xoffset, 0, 0,
-                    width, 1, 1, 0,
-                    format, type, pixels, packing, texObj, texImage);
-}
-
 void
 intelInitTextureSubImageFuncs(struct dd_function_table *functions)
 {
-   functions->TexSubImage1D = intelTexSubImage1D;
    functions->TexSubImage2D = intelTexSubImage2D;
-   functions->TexSubImage3D = intelTexSubImage3D;
 }