From: Ian Romanick <ian.d.roman...@intel.com>
The GLenum target parameter was not used in intel_copy_texsubimage, so
remove it.
---
src/mesa/drivers/dri/intel/intel_fbo.c | 2 +-
src/mesa/drivers/dri/intel/intel_tex.h | 1 -
src/mesa/drivers/dri/intel/intel_tex_copy.c | 5 ++---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c
b/src/mesa/drivers/dri/intel/intel_fbo.c
index 8421b69..6068e3c 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -894,7 +894,7 @@ intel_blit_framebuffer_copy_tex_sub_image(struct gl_context
*ctx,
_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,
diff --git a/src/mesa/drivers/dri/intel/intel_tex.h
b/src/mesa/drivers/dri/intel/intel_tex.h
index 1eaa3cc..ff6719c4 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.h
+++ b/src/mesa/drivers/dri/intel/intel_tex.h
@@ -72,7 +72,6 @@ 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,
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c
b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 600bd12..139847b 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -65,7 +65,6 @@ 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,
@@ -179,7 +178,7 @@ intelCopyTexSubImage1D(struct gl_context * ctx, GLenum
target, GLint level,
/* 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)) {
fallback_debug("%s - fallback to swrast\n", __FUNCTION__);
@@ -203,7 +202,7 @@ intelCopyTexSubImage2D(struct gl_context * ctx, GLenum
target, GLint level,
/* 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)) {
--
1.7.4.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
