From 92009554ce2e4c38c5abd4f09365ee8211570d4c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 27 Jun 2000 17:54:44 +0000
Subject: added LoadRGBMipmaps2()

---
 progs/util/readtex.c | 15 ++++++++++++++-
 progs/util/readtex.h | 13 ++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

(limited to 'progs')

diff --git a/progs/util/readtex.c b/progs/util/readtex.c
index e741ba5ae1..d9a5dc78f5 100644
--- a/progs/util/readtex.c
+++ b/progs/util/readtex.c
@@ -266,6 +266,15 @@ static void FreeImage( TK_RGBImageRec *image )
  * Return:  GL_TRUE if success, GL_FALSE if error.
  */
 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;
@@ -290,14 +299,18 @@ GLboolean LoadRGBMipmaps( const char *imageFile, GLint intFormat )
       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;
 }
 
diff --git a/progs/util/readtex.h b/progs/util/readtex.h
index 2156383ec2..8e544f1fb8 100644
--- a/progs/util/readtex.h
+++ b/progs/util/readtex.h
@@ -7,11 +7,18 @@
 #include <GL/gl.h>
 
 
-extern GLboolean LoadRGBMipmaps( const char *imageFile, GLint intFormat );
+extern GLboolean
+LoadRGBMipmaps( const char *imageFile, GLint intFormat );
 
 
-extern GLubyte *LoadRGBImage( const char *imageFile,
-                              GLint *width, GLint *height, GLenum *format );
+extern GLboolean
+LoadRGBMipmaps2( const char *imageFile, GLenum target,
+                 GLint intFormat, GLint *width, GLint *height );
+
+
+extern GLubyte *
+LoadRGBImage( const char *imageFile,
+              GLint *width, GLint *height, GLenum *format );
 
 
 #endif
-- 
cgit v1.2.3