From e8fdd0e0d5286f4a9c763ffde44decec51124ebc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 5 Jun 2012 16:32:23 -0600 Subject: mesa: consolidate internal glCompressedTexImage1/2/3D code Reviewed-by: Kenneth Graunke --- src/mesa/drivers/common/driverfuncs.c | 4 +--- src/mesa/drivers/dri/nouveau/nouveau_texture.c | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 118fc4ab06b..3d689362c61 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -97,9 +97,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->CopyTexSubImage = _mesa_meta_CopyTexSubImage; driver->GenerateMipmap = _mesa_meta_GenerateMipmap; driver->TestProxyTexImage = _mesa_test_proxy_teximage; - driver->CompressedTexImage1D = _mesa_store_compressed_teximage1d; - driver->CompressedTexImage2D = _mesa_store_compressed_teximage2d; - driver->CompressedTexImage3D = _mesa_store_compressed_teximage3d; + driver->CompressedTexImage = _mesa_store_compressed_teximage; driver->CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d; driver->CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d; driver->CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d; diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index 4d6518d2426..281d1dda458 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -555,10 +555,10 @@ nouveau_teximage_123d(struct gl_context *ctx, GLuint dims, } static void -nouveau_compressed_teximage_2d(struct gl_context *ctx, +nouveau_compressed_teximage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *ti, GLint internalFormat, - GLint width, GLint height, GLint border, + GLint width, GLint height, GLint depth, GLint border, GLsizei imageSize, const GLvoid *data) { nouveau_teximage(ctx, 2, ti, internalFormat, @@ -708,7 +708,7 @@ nouveau_texture_functions_init(struct dd_function_table *functions) functions->ChooseTextureFormat = nouveau_choose_tex_format; functions->TexImage = nouveau_teximage_123d; functions->TexSubImage = nouveau_texsubimage_123d; - functions->CompressedTexImage2D = nouveau_compressed_teximage_2d; + functions->CompressedTexImage = nouveau_compressed_teximage; functions->CompressedTexSubImage2D = nouveau_compressed_texsubimage_2d; functions->BindTexture = nouveau_bind_texture; functions->MapTextureImage = nouveau_map_texture_image; -- cgit v1.2.3