diff options
| author | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-06-12 21:38:44 +0300 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-08-12 15:49:28 -0700 |
| commit | c9a7dfcf92e6adb4b85338c2c8dbbfbaf39fbfe7 (patch) | |
| tree | 4953463bf82e63f8db3c3772718397293dc01059 /src/mesa/main | |
| parent | c5af8891805fc4f590c1371c098cdbc704c44e00 (diff) | |
mesa: Remove unnecessary parameters from AllocTextureImageBuffer
Size and format information is always stored in gl_texture_image
structure. That makes it preferable to remove duplicate information from
parameters to make interface easier to understand.
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.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/mipmap.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 546e360819a..4346b9e6155 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -327,9 +327,7 @@ struct dd_function_table { /** Called to allocate memory for a single texture image */ GLboolean (*AllocTextureImageBuffer)(struct gl_context *ctx, - struct gl_texture_image *texImage, - gl_format format, GLsizei width, - GLsizei height, GLsizei depth); + struct gl_texture_image *texImage); /** Free the memory for a single texture image */ void (*FreeTextureImageBuffer)(struct gl_context *ctx, diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 9f531ae20bb..00d3e8f9ed6 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1865,8 +1865,7 @@ _mesa_prepare_mipmap_level(struct gl_context *ctx, width, height, depth, border, intFormat, format); - ctx->Driver.AllocTextureImageBuffer(ctx, dstImage, - format, width, height, depth); + ctx->Driver.AllocTextureImageBuffer(ctx, dstImage); /* in case the mipmap level is part of an FBO: */ _mesa_update_fbo_texture(ctx, texObj, face, level); diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 52eef3ebab3..393b9a8a5f1 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -4345,9 +4345,7 @@ _mesa_store_teximage(struct gl_context *ctx, return; /* allocate storage for texture data */ - if (!ctx->Driver.AllocTextureImageBuffer(ctx, texImage, texImage->TexFormat, - texImage->Width, texImage->Height, - texImage->Depth)) { + if (!ctx->Driver.AllocTextureImageBuffer(ctx, texImage)) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims); return; } @@ -4402,8 +4400,7 @@ _mesa_store_compressed_teximage(struct gl_context *ctx, GLuint dims, ASSERT(texImage->Depth == 1); /* allocate storage for texture data */ - if (!ctx->Driver.AllocTextureImageBuffer(ctx, texImage, texImage->TexFormat, - width, height, 1)) { + if (!ctx->Driver.AllocTextureImageBuffer(ctx, texImage)) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D"); return; } |