Mesa (master): mesa: s/GLchan/GLubyte/ in mipmap generation code
Brian Paul
brianp at kemper.freedesktop.org
Wed Sep 21 02:19:51 UTC 2011
Module: Mesa
Branch: master
Commit: 529b9360f326dd25bd12cf8e036b9ac1c63a8032
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=529b9360f326dd25bd12cf8e036b9ac1c63a8032
Author: Brian Paul <brianp at vmware.com>
Date: Sat Sep 17 15:22:28 2011 -0600
mesa: s/GLchan/GLubyte/ in mipmap generation code
---
src/mesa/main/mipmap.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index f170d23..5f18c71 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);
}
More information about the mesa-commit
mailing list