From 581507f10aaa8a0239c9152501ad6f79aa61a08e Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Wed, 13 Dec 2017 19:14:36 +0100 Subject: mesa: remove dd_function_table::GetCompressedTexSubImage and clean it up Reviewed-by: Ian Romanick --- src/mesa/main/texgetimage.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/mesa/main/texgetimage.c') diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index 26cf3e5644e..c61842e39ad 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -761,16 +761,15 @@ _mesa_GetTexSubImage_sw(struct gl_context *ctx, /** - * This is the software fallback for Driver.GetCompressedTexSubImage(). - * All error checking will have been done before this routine is called. + * This function assumes that all error checking has been done. */ -void -_mesa_GetCompressedTexSubImage_sw(struct gl_context *ctx, - struct gl_texture_image *texImage, - GLint xoffset, GLint yoffset, - GLint zoffset, GLsizei width, - GLint height, GLint depth, - GLvoid *img) +static void +get_compressed_texsubimage_sw(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLint height, GLint depth, + GLvoid *img) { const GLuint dimensions = _mesa_get_texture_dimensions(texImage->TexObject->Target); @@ -1661,9 +1660,9 @@ get_compressed_texture_image(struct gl_context *ctx, texImage = texObj->Image[firstFace + i][level]; assert(texImage); - ctx->Driver.GetCompressedTexSubImage(ctx, texImage, - xoffset, yoffset, zoffset, - width, height, depth, pixels); + get_compressed_texsubimage_sw(ctx, texImage, + xoffset, yoffset, zoffset, + width, height, depth, pixels); /* next cube face */ pixels = (GLubyte *) pixels + imageStride; -- cgit v1.2.3