diff options
| author | Brian Paul <[email protected]> | 2011-12-30 08:24:56 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-12-30 08:24:56 -0700 |
| commit | bec2ea8ef4aaf0704d3315561da106cd994b1bc6 (patch) | |
| tree | 8bfc560469360bc312dedaec6d15ba0434311810 /src/mesa | |
| parent | 94a0c518dc90a24cb4c44ce0a5e6abeba57cbb08 (diff) | |
mesa: simplify Driver.GetCompressedTexImage() parameters
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/dd.h | 7 | ||||
| -rw-r--r-- | src/mesa/main/texgetimage.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/texgetimage.h | 7 |
3 files changed, 10 insertions, 14 deletions
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 5a306e3902f..6707e785dc7 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -400,10 +400,9 @@ struct dd_function_table { /** * Called by glGetCompressedTexImage. */ - void (*GetCompressedTexImage)(struct gl_context *ctx, GLenum target, GLint level, - GLvoid *img, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage); + void (*GetCompressedTexImage)(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLvoid *data); /*@}*/ diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 738c181121d..f848aa89de6 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -603,10 +603,9 @@ _mesa_get_teximage(struct gl_context *ctx, * All error checking will have been done before this routine is called. */ void -_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level, - GLvoid *img, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) +_mesa_get_compressed_teximage(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLvoid *img) { const GLuint row_stride = _mesa_format_row_stride(texImage->TexFormat, texImage->Width); @@ -981,8 +980,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, _mesa_lock_texture(ctx, texObj); { - ctx->Driver.GetCompressedTexImage(ctx, target, level, img, - texObj, texImage); + ctx->Driver.GetCompressedTexImage(ctx, texImage, img); } _mesa_unlock_texture(ctx, texObj); } diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h index 02b1cf4599c..cd8e76e7a3e 100644 --- a/src/mesa/main/texgetimage.h +++ b/src/mesa/main/texgetimage.h @@ -40,10 +40,9 @@ _mesa_get_teximage(struct gl_context *ctx, extern void -_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level, - GLvoid *img, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage); +_mesa_get_compressed_teximage(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLvoid *data); |