mesa: consolidate internal glCompressedTexSubImage1/2/3D code

Reviewed-by: Kenneth Graunke <[email protected]>

2 files changed, 7 insertions, 9 deletions

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 3d689362c61..93fa3c745e7 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -98,9 +98,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->GenerateMipmap = _mesa_meta_GenerateMipmap;
    driver->TestProxyTexImage = _mesa_test_proxy_teximage;
    driver->CompressedTexImage = _mesa_store_compressed_teximage;
-   driver->CompressedTexSubImage1D = _mesa_store_compressed_texsubimage1d;
-   driver->CompressedTexSubImage2D = _mesa_store_compressed_texsubimage2d;
-   driver->CompressedTexSubImage3D = _mesa_store_compressed_texsubimage3d;
+   driver->CompressedTexSubImage = _mesa_store_compressed_texsubimage;
    driver->GetCompressedTexImage = _mesa_get_compressed_teximage;
    driver->BindTexture = NULL;
    driver->NewTextureObject = _mesa_new_texture_object;
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index 281d1dda458..0060f464307 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -624,15 +624,15 @@ nouveau_texsubimage_123d(struct gl_context *ctx, GLuint dims,
 }
 
 static void
-nouveau_compressed_texsubimage_2d(struct gl_context *ctx,
+nouveau_compressed_texsubimage(struct gl_context *ctx, GLuint dims,
 		       struct gl_texture_image *ti,
-		       GLint xoffset, GLint yoffset,
-		       GLsizei width, GLint height,
+		       GLint xoffset, GLint yoffset, GLint zoffset,
+		       GLsizei width, GLint height, GLint depth,
 		       GLenum format,
 		       GLint imageSize, const void *data)
 {
-	nouveau_texsubimage(ctx, 2, ti, xoffset, yoffset, 0,
-			  width, height, 1, imageSize, format, 0, data,
+	nouveau_texsubimage(ctx, dims, ti, xoffset, yoffset, zoffset,
+			  width, height, depth, imageSize, format, 0, data,
 			  &ctx->Unpack, GL_TRUE);
 }
 
@@ -709,7 +709,7 @@ nouveau_texture_functions_init(struct dd_function_table *functions)
 	functions->TexImage = nouveau_teximage_123d;
 	functions->TexSubImage = nouveau_texsubimage_123d;
 	functions->CompressedTexImage = nouveau_compressed_teximage;
-	functions->CompressedTexSubImage2D = nouveau_compressed_texsubimage_2d;
+	functions->CompressedTexSubImage = nouveau_compressed_texsubimage;
 	functions->BindTexture = nouveau_bind_texture;
 	functions->MapTextureImage = nouveau_map_texture_image;
 	functions->UnmapTextureImage = nouveau_unmap_texture_image;