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/main/texstore.h | |
| parent | 3a62e8bcac75ca296619adb7fe4ea806a98beef9 (diff) | |
| download | external_mesa3d-8f5fffe75d2f8ae7c7ee706b53379a25bc673ae4.zip external_mesa3d-8f5fffe75d2f8ae7c7ee706b53379a25bc673ae4.tar.gz external_mesa3d-8f5fffe75d2f8ae7c7ee706b53379a25bc673ae4.tar.bz2 | |
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/main/texstore.h')
| -rw-r--r-- | src/mesa/main/texstore.h | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index 85e33b0..b4995fb 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -90,30 +90,13 @@ _mesa_make_temp_float_image(struct gl_context *ctx, GLuint dims, GLbitfield transferOps); extern void -_mesa_store_teximage1d(struct gl_context *ctx, - struct gl_texture_image *texImage, - GLint internalFormat, - GLint width, GLint border, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing); - - -extern void -_mesa_store_teximage2d(struct gl_context *ctx, - struct gl_texture_image *texImage, - GLint internalFormat, - GLint width, GLint height, GLint border, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing); - - -extern void -_mesa_store_teximage3d(struct gl_context *ctx, - struct gl_texture_image *texImage, - GLint internalFormat, - GLint width, GLint height, GLint depth, GLint border, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *packing); +_mesa_store_teximage(struct gl_context *ctx, + GLuint dims, + struct gl_texture_image *texImage, + GLint internalFormat, + GLint width, GLint height, GLint depth, GLint border, + GLenum format, GLenum type, const GLvoid *pixels, + const struct gl_pixelstore_attrib *packing); extern void |