diff options
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/dd.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/texstore.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 5 |
6 files changed, 4 insertions, 20 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 18dc9f7e650..0e42758040f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -553,8 +553,6 @@ nouveau_teximage_123d(struct gl_context *ctx, GLuint dims, static void nouveau_compressed_teximage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *ti, - GLint internalFormat, - GLint width, GLint height, GLint depth, GLint border, GLsizei imageSize, const GLvoid *data) { nouveau_teximage(ctx, 2, ti, imageSize, 0, 0, data, 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); diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 5385ed8a4b9..a7c732bd72f 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -541,13 +541,10 @@ st_TexImage(struct gl_context * ctx, GLuint dims, static void st_CompressedTexImage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage, - GLint internalFormat, - GLint width, GLint height, GLint border, GLint depth, GLsizei imageSize, const GLvoid *data) { prep_teximage(ctx, texImage, GL_NONE, GL_NONE); - _mesa_store_compressed_teximage(ctx, dims, texImage, internalFormat, width, - height, depth, border, imageSize, data); + _mesa_store_compressed_teximage(ctx, dims, texImage, imageSize, data); } |