From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 25 Feb 2008 21:52:35 +0000 (-0500)
Subject: Change GetCompressedTexImage in dd_function_table to not take const pointers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=61c3c2c36301671b8f913cf739e13d049ef91868;p=mesa.git

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 d1055be93e6..34995f4ebf2 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 4cbc453c704..df08ee1a3be 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 77d27bb03dd..ce33905af13 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 37d6f81c8b9..90edca86e83 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 da0c7cb78e5..5128bc58276 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,