commit 92009554ce2e4c38c5abd4f09365ee8211570d4c
author Brian Paul <brian.paul@tungstengraphics.com> Tue Jun 27 17:54:44 2000 +0000
committer Brian Paul <brian.paul@tungstengraphics.com> Tue Jun 27 17:54:44 2000 +0000
tree d71416d6cf8cf15640966e62cba6672716e4dc5a
parent dbd52e50ff958d6e5c38b27f4fade701adb51834

added LoadRGBMipmaps2()

progs/util/readtex.c

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index e741ba5..d9a5dc7 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -267,6 +267,15 @@
  */
 GLboolean LoadRGBMipmaps( const char *imageFile, GLint intFormat )
 {
+   GLint w, h;
+   return LoadRGBMipmaps2( imageFile, GL_TEXTURE_2D, intFormat, &w, &h );
+}
+
+
+
+GLboolean LoadRGBMipmaps2( const char *imageFile, GLenum target,
+                           GLint intFormat, GLint *width, GLint *height )
+{
    GLint error;
    GLenum format;
    TK_RGBImageRec *image;
@@ -290,14 +299,18 @@
       return GL_FALSE;
    }
 
-   error = gluBuild2DMipmaps( GL_TEXTURE_2D,
+   error = gluBuild2DMipmaps( target,
                               intFormat,
                               image->sizeX, image->sizeY,
                               format,
                               GL_UNSIGNED_BYTE,
                               image->data );
 
+   *width = image->sizeX;
+   *height = image->sizeY;
+
    FreeImage(image);
+
    return error ? GL_FALSE : GL_TRUE;
 }