intel: Silence "warning: unused parameter ‘target’"

The GLenum target parameter was not used in intel_copy_texsubimage, so
remove it.  Also remove the GLenum internalFormat parameter.  Each
caller just copied this out of the intel_texture_image that is already
passed to intel_copy_texsubimage.

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index bd35ac5c1e781e5990a79bf59ea5fe66059f2b48..6c55fdc61c0d45bf8c8f93869e9320fbbc728603 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -903,11 +903,9 @@ intel_blit_framebuffer_copy_tex_sub_image(struct gl_context *ctx,
 
          struct gl_texture_image *texImage =
             _mesa_select_tex_image(ctx, texObj, target, dstLevel);
-         GLenum internalFormat = texImage->InternalFormat;
 
-         if (intel_copy_texsubimage(intel_context(ctx), target,
+         if (intel_copy_texsubimage(intel_context(ctx),
                                     intel_texture_image(texImage),
-                                    internalFormat,
                                     dstX0, dstY0,
                                     srcX0, srcY0,
                                     srcX1 - srcX0, /* width */

diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h
index 1eaa3cc9167ef7fa813a5f196fec8b6033d1270c..895c6348e856393de3fa6c8a257632117e64aee6 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_tex.h
+++ b/src/mesa/drivers/dri/intel/intel_tex.h
@@ -72,9 +72,7 @@ void intel_tex_image_s8z24_gather(struct intel_context *intel,
 int intel_compressed_num_bytes(GLuint mesaFormat);
 
 GLboolean intel_copy_texsubimage(struct intel_context *intel,
-                                 GLenum target,
                                  struct intel_texture_image *intelImage,
-                                 GLenum internalFormat,
                                  GLint dstx, GLint dsty,
                                  GLint x, GLint y,
                                  GLsizei width, GLsizei height);

diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 600bd1251e077f3e396a2c7f4c56a3a553da9abd..a2ae2db165f45f49bc4024a7f35bcade7a42f854 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -65,14 +65,13 @@ get_teximage_readbuffer(struct intel_context *intel, GLenum internalFormat)
 
 GLboolean
 intel_copy_texsubimage(struct intel_context *intel,
-                       GLenum target,
                        struct intel_texture_image *intelImage,
-                       GLenum internalFormat,
                        GLint dstx, GLint dsty,
                        GLint x, GLint y, GLsizei width, GLsizei height)
 {
    struct gl_context *ctx = &intel->ctx;
    struct intel_renderbuffer *irb;
+   const GLenum internalFormat = intelImage->base.InternalFormat;
    bool copy_supported = false;
    bool copy_supported_with_alpha_override = false;
 
@@ -172,16 +171,15 @@ intelCopyTexSubImage1D(struct gl_context * ctx, GLenum target, GLint level,
       _mesa_select_tex_object(ctx, texUnit, target);
    struct gl_texture_image *texImage =
       _mesa_select_tex_image(ctx, texObj, target, level);
-   GLenum internalFormat = texImage->InternalFormat;
 
    /* XXX need to check <border> as in above function? */
 
    /* Need to check texture is compatible with source format. 
     */
 
-   if (!intel_copy_texsubimage(intel_context(ctx), target,
+   if (!intel_copy_texsubimage(intel_context(ctx),
                                intel_texture_image(texImage),
-                               internalFormat, xoffset, 0, x, y, width, 1)) {
+                               xoffset, 0, x, y, width, 1)) {
       fallback_debug("%s - fallback to swrast\n", __FUNCTION__);
       _mesa_meta_CopyTexSubImage1D(ctx, target, level, xoffset, x, y, width);
    }
@@ -198,14 +196,12 @@ intelCopyTexSubImage2D(struct gl_context * ctx, GLenum target, GLint level,
       _mesa_select_tex_object(ctx, texUnit, target);
    struct gl_texture_image *texImage =
       _mesa_select_tex_image(ctx, texObj, target, level);
-   GLenum internalFormat = texImage->InternalFormat;
 
    /* Need to check texture is compatible with source format. 
     */
 
-   if (!intel_copy_texsubimage(intel_context(ctx), target,
+   if (!intel_copy_texsubimage(intel_context(ctx),
                                intel_texture_image(texImage),
-                               internalFormat,
                                xoffset, yoffset, x, y, width, height)) {
       fallback_debug("%s - fallback to swrast\n", __FUNCTION__);
       _mesa_meta_CopyTexSubImage2D(ctx, target, level,