summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorPauli Nieminen <pauli.nieminen@linux.intel.com>2012-06-12 21:38:45 +0300
committerKenneth Graunke <kenneth@whitecape.org>2012-08-12 15:49:30 -0700
commit5606bd574e264c4beda8eb1d10b48d17e9b8b497 (patch)
treecebc1860a6a3b09d8eb9415918969329f81ebc9d /src/mesa/main
parentc9a7dfcf92e6adb4b85338c2c8dbbfbaf39fbfe7 (diff)
mesa: Remove unnecessary parameters CompressedTexImage
In tune with previous patches. Again there is duplication of information in function parameters that is good to remove. Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/dd.h3
-rw-r--r--src/mesa/main/teximage.c6
-rw-r--r--src/mesa/main/texstore.c5
-rw-r--r--src/mesa/main/texstore.h3
4 files changed, 3 insertions, 14 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 4346b9e6155..226897b1915 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -271,9 +271,6 @@ struct dd_function_table {
*/
void (*CompressedTexImage)(struct gl_context *ctx, GLuint dims,
struct gl_texture_image *texImage,
- GLint internalFormat,
- GLsizei width, GLsizei height, GLsizei depth,
- GLint border,
GLsizei imageSize, const GLvoid *data);
/**
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 607869cdf76..569adc16a7f 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -3550,10 +3550,8 @@ compressedteximage(struct gl_context *ctx, GLuint dims,
width, height, depth,
border, internalFormat, texFormat);
- ctx->Driver.CompressedTexImage(ctx, dims, texImage,
- internalFormat,
- width, height, depth,
- border, imageSize, data);
+ ctx->Driver.CompressedTexImage(ctx, dims, texImage, imageSize,
+ data);
check_gen_mipmap(ctx, target, texObj, level);
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 393b9a8a5f1..544c08d73c7 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -4379,9 +4379,6 @@ _mesa_store_texsubimage(struct gl_context *ctx, GLuint dims,
void
_mesa_store_compressed_teximage(struct gl_context *ctx, GLuint dims,
struct gl_texture_image *texImage,
- GLint internalFormat,
- GLint width, GLint height, GLint depth,
- GLint border,
GLsizei imageSize, const GLvoid *data)
{
/* only 2D compressed images are supported at this time */
@@ -4407,7 +4404,7 @@ _mesa_store_compressed_teximage(struct gl_context *ctx, GLuint dims,
_mesa_store_compressed_texsubimage(ctx, dims, texImage,
0, 0, 0,
- width, height, depth,
+ texImage->Width, texImage->Height, texImage->Depth,
texImage->TexFormat,
imageSize, data);
}
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index fbcb41b490d..7af532d652e 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -109,9 +109,6 @@ _mesa_store_texsubimage(struct gl_context *ctx, GLuint dims,
extern void
_mesa_store_compressed_teximage(struct gl_context *ctx, GLuint dims,
struct gl_texture_image *texImage,
- GLint internalFormat,
- GLint width, GLint height, GLint depth,
- GLint border,
GLsizei imageSize, const GLvoid *data);