diff options
Diffstat (limited to 'src/mesa/drivers/dri/radeon')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 50 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.h | 23 |
2 files changed, 25 insertions, 48 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c index 71eff75cc04..78fb1b5c7d1 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.c +++ b/src/mesa/drivers/dri/radeon/radeon_texture.c @@ -578,58 +578,56 @@ static void teximage_assign_miptree(radeonContextPtr rmesa, */ static void radeon_teximage( struct gl_context *ctx, int dims, - GLenum target, GLint level, + struct gl_texture_image *texImage, GLint internalFormat, GLint width, GLint height, GLint depth, GLsizei imageSize, GLenum format, GLenum type, const GLvoid * pixels, const struct gl_pixelstore_attrib *packing, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage, int compressed) { - _mesa_store_teximage3d(ctx, target, level, internalFormat, + _mesa_store_teximage3d(ctx, texImage, internalFormat, width, height, depth, 0, format, type, pixels, - packing, texObj, texImage); + packing); } -void radeonTexImage1D(struct gl_context * ctx, GLenum target, GLint level, +static void +radeonTexImage1D(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, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) + const struct gl_pixelstore_attrib *packing) { - radeon_teximage(ctx, 1, target, level, internalFormat, width, 1, 1, - 0, format, type, pixels, packing, texObj, texImage, 0); + radeon_teximage(ctx, 1, texImage, internalFormat, width, 1, 1, + 0, format, type, pixels, packing, 0); } -void radeonTexImage2D(struct gl_context * ctx, GLenum target, GLint level, - GLint internalFormat, - GLint width, GLint height, GLint border, - GLenum format, GLenum type, const GLvoid * pixels, - const struct gl_pixelstore_attrib *packing, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) +static void +radeonTexImage2D(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) { - radeon_teximage(ctx, 2, target, level, internalFormat, width, height, 1, - 0, format, type, pixels, packing, texObj, texImage, 0); + radeon_teximage(ctx, 2, texImage, internalFormat, width, height, 1, + 0, format, type, pixels, packing, 0); } -void radeonTexImage3D(struct gl_context * ctx, GLenum target, GLint level, +static void +radeonTexImage3D(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, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage) + const struct gl_pixelstore_attrib *packing) { - radeon_teximage(ctx, 3, target, level, internalFormat, width, height, depth, - 0, format, type, pixels, packing, texObj, texImage, 0); + radeon_teximage(ctx, 3, texImage, internalFormat, width, height, depth, + 0, format, type, pixels, packing, 0); } unsigned radeonIsFormatRenderable(gl_format mesa_format) diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.h b/src/mesa/drivers/dri/radeon/radeon_texture.h index f1af109707f..ebe16c05f99 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texture.h +++ b/src/mesa/drivers/dri/radeon/radeon_texture.h @@ -65,34 +65,13 @@ gl_format radeonChooseTextureFormat(struct gl_context * ctx, GLenum format, GLenum type, GLboolean fbo); -void radeonTexImage1D(struct gl_context * ctx, GLenum target, GLint level, - GLint internalFormat, - GLint width, GLint border, - GLenum format, GLenum type, const GLvoid * pixels, - const struct gl_pixelstore_attrib *packing, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage); -void radeonTexImage2D(struct gl_context * ctx, GLenum target, GLint level, - GLint internalFormat, - GLint width, GLint height, GLint border, - GLenum format, GLenum type, const GLvoid * pixels, - const struct gl_pixelstore_attrib *packing, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage); void radeonCompressedTexImage2D(struct gl_context * ctx, GLenum target, GLint level, GLint internalFormat, GLint width, GLint height, GLint border, GLsizei imageSize, const GLvoid * data, struct gl_texture_object *texObj, struct gl_texture_image *texImage); -void radeonTexImage3D(struct gl_context * ctx, GLenum target, GLint level, - GLint internalFormat, - GLint width, GLint height, GLint depth, - GLint border, - GLenum format, GLenum type, const GLvoid * pixels, - const struct gl_pixelstore_attrib *packing, - struct gl_texture_object *texObj, - struct gl_texture_image *texImage); + void radeonTexSubImage1D(struct gl_context * ctx, GLenum target, GLint level, GLint xoffset, GLsizei width, |