From: Brian Paul <brianp@vmware.com>
Date: Sat, 17 Sep 2011 21:22:28 +0000 (-0600)
Subject: mesa: s/GLchan/GLubyte/ in mipmap generation code
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=529b9360f326dd25bd12cf8e036b9ac1c63a8032;p=mesa.git

mesa: s/GLchan/GLubyte/ in mipmap generation code
---

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index f170d235a2e..5f18c71681d 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1986,7 +1986,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
    gl_format temp_format;
    GLint components;
    GLuint temp_src_stride, temp_dst_stride; /* in bytes */
-   GLchan *temp_src = NULL, *temp_dst = NULL;
+   GLubyte *temp_src = NULL, *temp_dst = NULL;
    GLenum temp_datatype;
    GLenum temp_base_format;
 
@@ -2101,7 +2101,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
 
       /* swap src and dest pointers */
       {
-	 GLchan *temp = temp_src;
+	 GLubyte *temp = temp_src;
 	 temp_src = temp_dst;
 	 temp_dst = temp;
 
@@ -2109,7 +2109,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target,
       }
    } /* loop over mipmap levels */
 
-   free((void *) temp_src);
+   free(temp_src);
    free(temp_dst);
 }