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.

diff --git a/src/mesa/drivers/dri/intel/intel_tex.h b/src/mesa/drivers/dri/intel/intel_tex.h
index d1055be93e6879f56c664d2953ef915716adb75a..34995f4ebf247aaae0ff82547fef69957cf9f919 100644 (file)
--- 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 4cbc453c704d9b1f8921becd3803340b2b59f5fe..df08ee1a3bea2b6709556c078941e8225f6bb3bd 100644 (file)
--- 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 77d27bb03ddaf01b62ca7a1f7c77cb498d78b011..ce33905af132c225f12de9d817f2289e8b16282c 100644 (file)
--- 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 37d6f81c8b903b1ae94c8dc66ee7961b89dc6d89..90edca86e8398b656d1f08aefdd52f9d307434d3 100644 (file)
--- 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 da0c7cb78e56550a9be2cf61cdf2a3aa727d4fbf..5128bc58276393ecc0d8c733ed47792485873294 100644 (file)
--- 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,