diff options
| author | Brian Paul <[email protected]> | 1999-11-09 06:16:59 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 1999-11-09 06:16:59 +0000 |
| commit | 0822c1050ea4e91957fc7109358c3bd7daca3480 (patch) | |
| tree | b577da9e2cc04946e856906dbb8e0aad5083a881 | |
| parent | c00c0b323fd46385faaa75395553247ed089eaba (diff) | |
replace GLint with GLsizei in a gluScaleImage, gluBuild1/2DMipmaps()
| -rw-r--r-- | include/GL/glu.h | 10 | ||||
| -rw-r--r-- | src/glu/mesa/mipmap.c | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/include/GL/glu.h b/include/GL/glu.h index 6cf56d789b8..394883c548b 100644 --- a/include/GL/glu.h +++ b/include/GL/glu.h @@ -1,4 +1,4 @@ -/* $Id: glu.h,v 1.13 1999/10/27 09:43:48 brianp Exp $ */ +/* $Id: glu.h,v 1.14 1999/11/09 06:17:08 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -290,17 +290,17 @@ GLUAPI const GLubyte* GLAPIENTRY gluErrorString( GLenum errorCode ); */ GLUAPI GLint GLAPIENTRY gluScaleImage( GLenum format, - GLint widthin, GLint heightin, + GLsizei widthin, GLsizei heightin, GLenum typein, const void *datain, - GLint widthout, GLint heightout, + GLsizei widthout, GLsizei heightout, GLenum typeout, void *dataout ); GLUAPI GLint GLAPIENTRY gluBuild1DMipmaps( GLenum target, GLint components, - GLint width, GLenum format, + GLsizei width, GLenum format, GLenum type, const void *data ); GLUAPI GLint GLAPIENTRY gluBuild2DMipmaps( GLenum target, GLint components, - GLint width, GLint height, + GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data ); diff --git a/src/glu/mesa/mipmap.c b/src/glu/mesa/mipmap.c index 63246f3958e..9f4ffcfea89 100644 --- a/src/glu/mesa/mipmap.c +++ b/src/glu/mesa/mipmap.c @@ -1,4 +1,4 @@ -/* $Id: mipmap.c,v 1.2 1999/09/14 00:30:28 brianp Exp $ */ +/* $Id: mipmap.c,v 1.3 1999/11/09 06:16:59 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -23,6 +23,9 @@ /* * $Log: mipmap.c,v $ + * Revision 1.3 1999/11/09 06:16:59 brianp + * replace GLint with GLsizei in a gluScaleImage, gluBuild1/2DMipmaps() + * * Revision 1.2 1999/09/14 00:30:28 brianp * fixed pixel packing/unpacking code in gluBuild2DMipmaps() * @@ -105,9 +108,9 @@ void dummy(GLuint j, GLuint k){ GLint GLAPIENTRY gluScaleImage( GLenum format, - GLint widthin, GLint heightin, + GLsizei widthin, GLsizei heightin, GLenum typein, const void *datain, - GLint widthout, GLint heightout, + GLsizei widthout, GLsizei heightout, GLenum typeout, void *dataout ) { GLint components, i, j, k; @@ -633,7 +636,7 @@ static GLint bytes_per_pixel( GLenum format, GLenum type ) * WARNING: This function isn't finished and has never been tested!!!! */ GLint GLAPIENTRY gluBuild1DMipmaps( GLenum target, GLint components, - GLint width, GLenum format, + GLsizei width, GLenum format, GLenum type, const void *data ) { GLubyte *texture; @@ -711,7 +714,7 @@ GLint GLAPIENTRY gluBuild1DMipmaps( GLenum target, GLint components, GLint GLAPIENTRY gluBuild2DMipmaps( GLenum target, GLint components, - GLint width, GLint height, GLenum format, + GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data ) { GLint w, h, maxsize; |