KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Pauli Nieminen 2012-06-12 21:38:45 +03:00 committed by Kenneth Graunke
parent c9a7dfcf92
commit 5606bd574e
6 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/nouveau/nouveau_texture.c
View File

@ -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,

3
src/mesa/main/dd.h
View File

@ -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);
/**

6
src/mesa/main/teximage.c
View File

@ -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);

5
src/mesa/main/texstore.c
View File

@ -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);
}

3
src/mesa/main/texstore.h
View File

@ -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);

5
src/mesa/state_tracker/st_cb_texture.c
View File

@ -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);
}