diff options
author | Brian Paul <[email protected]> | 2012-06-05 16:32:23 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2012-06-06 07:56:00 -0600 |
commit | ec19bdd16c3d4070af69fd865042babe0a627595 (patch) | |
tree | d39293036df9b454e8c1d13350dbe7530924868c /src/mesa/drivers/dri/nouveau | |
parent | e8fdd0e0d5286f4a9c763ffde44decec51124ebc (diff) |
mesa: consolidate internal glCompressedTexSubImage1/2/3D code
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau')
-rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |