diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-02-25 16:52:35 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-02-25 19:02:06 -0500 |
| commit | 61c3c2c36301671b8f913cf739e13d049ef91868 (patch) | |
| tree | e339bafb197cfe58768a8d3c4431b7c919c0c047 | |
| parent | 6e8d21d72f35767e07081a8bee4323aaaf5e2aae (diff) | |
Change GetCompressedTexImage in dd_function_table to not take const pointers.
They're changed by the intel driver implementation and thus not const.
Fixes compilation warning.
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_image.c | 5 | ||||
| -rw-r--r-- | src/mesa/main/dd.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/texstore.h | 4 |
5 files changed, 10 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h index d1055be93e..34995f4ebf 100644 --- a/src/mesa/drivers/dri/intel/intel_tex.h +++ b/src/mesa/drivers/dri/intel/intel_tex.h @@ -132,8 +132,8 @@ void intelCompressedTexImage2D( GLcontext *ctx, GLenum target, GLint level, void intelGetCompressedTexImage(GLcontext *ctx, GLenum target, GLint level, GLvoid *pixels, - const struct gl_texture_object *texObj, - const struct gl_texture_image *texImage); + struct gl_texture_object *texObj, + struct gl_texture_image *texImage); void intelSetTexOffset(__DRIcontext *pDRICtx, GLint texname, unsigned long long offset, GLint depth, GLuint pitch); diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c index 4cbc453c70..df08ee1a3b 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_image.c +++ b/src/mesa/drivers/dri/intel/intel_tex_image.c @@ -663,12 +663,11 @@ intelGetTexImage(GLcontext * ctx, GLenum target, GLint level, void intelGetCompressedTexImage(GLcontext *ctx, GLenum target, GLint level, GLvoid *pixels, - const struct gl_texture_object *texObj, - const struct gl_texture_image *texImage) + struct gl_texture_object *texObj, + struct gl_texture_image *texImage) { intel_get_tex_image(ctx, target, level, 0, 0, pixels, texObj, texImage, 1); - } void diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 77d27bb03d..ce33905af1 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -445,8 +445,8 @@ struct dd_function_table { */ void (*GetCompressedTexImage)(GLcontext *ctx, GLenum target, GLint level, GLvoid *img, - const struct gl_texture_object *texObj, - const struct gl_texture_image *texImage); + struct gl_texture_object *texObj, + struct gl_texture_image *texImage); /** * Called to query number of bytes of storage needed to store the diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 37d6f81c8b..90edca86e8 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -3656,8 +3656,8 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level, void _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level, GLvoid *img, - const struct gl_texture_object *texObj, - const struct gl_texture_image *texImage) + struct gl_texture_object *texObj, + struct gl_texture_image *texImage) { GLuint size; diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index da0c7cb78e..5128bc5827 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -214,8 +214,8 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level, extern void _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level, GLvoid *img, - const struct gl_texture_object *texObj, - const struct gl_texture_image *texImage); + struct gl_texture_object *texObj, + struct gl_texture_image *texImage); extern const GLvoid * _mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions, |