diff options
author | Brian Paul <brianp@vmware.com> | 2012-06-05 16:32:23 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2012-06-06 07:55:59 -0600 |
commit | 8f5fffe75d2f8ae7c7ee706b53379a25bc673ae4 (patch) | |
tree | 03874713de5f5f611a8d6f7569b658a5ce3f9700 /src/mesa/drivers/dri/nouveau/nouveau_texture.c | |
parent | 3a62e8bcac75ca296619adb7fe4ea806a98beef9 (diff) |
mesa: consolidate internal glTexImage1/2/3D code
The functions for handling 1D, 2D and 3D texture images were nearly
identical. This folds them all together.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_texture.c')
-rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_texture.c | 43 |
1 files changed, 8 insertions, 35 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c index a2e96aa1684..e5ef3d3ff9f 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c @@ -540,41 +540,16 @@ nouveau_teximage(struct gl_context *ctx, GLint dims, context_dirty_i(ctx, TEX_ENV, ctx->Texture.CurrentUnit); } -static void -nouveau_teximage_1d(struct gl_context *ctx, - struct gl_texture_image *ti, - GLint internalFormat, - GLint width, GLint border, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing) -{ - nouveau_teximage(ctx, 1, ti, internalFormat, - width, 1, 1, border, 0, format, type, pixels, - packing, GL_FALSE); -} static void -nouveau_teximage_2d(struct gl_context *ctx, - struct gl_texture_image *ti, - GLint internalFormat, - GLint width, GLint height, GLint border, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing) -{ - nouveau_teximage(ctx, 2, ti, internalFormat, - width, height, 1, border, 0, format, type, pixels, - packing, GL_FALSE); -} - -static void -nouveau_teximage_3d(struct gl_context *ctx, - struct gl_texture_image *ti, - GLint internalFormat, - GLint width, GLint height, GLint depth, GLint border, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing) +nouveau_teximage_123d(struct gl_context *ctx, GLuint dims, + struct gl_texture_image *ti, + GLint internalFormat, + GLint width, GLint height, GLint depth, GLint border, + GLenum format, GLenum type, const GLvoid *pixels, + const struct gl_pixelstore_attrib *packing) { - nouveau_teximage(ctx, 3, ti, internalFormat, + nouveau_teximage(ctx, dims, ti, internalFormat, width, height, depth, border, 0, format, type, pixels, packing, GL_FALSE); } @@ -756,9 +731,7 @@ nouveau_texture_functions_init(struct dd_function_table *functions) functions->NewTextureImage = nouveau_teximage_new; functions->FreeTextureImageBuffer = nouveau_teximage_free; functions->ChooseTextureFormat = nouveau_choose_tex_format; - functions->TexImage1D = nouveau_teximage_1d; - functions->TexImage2D = nouveau_teximage_2d; - functions->TexImage3D = nouveau_teximage_3d; + functions->TexImage = nouveau_teximage_123d; functions->TexSubImage1D = nouveau_texsubimage_1d; functions->TexSubImage2D = nouveau_texsubimage_2d; functions->TexSubImage3D = nouveau_texsubimage_3d; |