Mesa (gallium-s3tc): progs/tests: Make texcompress2 get texture

[Jakob Bornecrantz]

Module: Mesa
Branch: gallium-s3tc
Commit: 82e92eeab0c831683961175d155865786149a354
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=82e92eeab0c831683961175d155865786149a354

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Wed Apr 15 23:36:22 2009 +0200

progs/tests: Make texcompress2 get texture

---

 progs/tests/texcompress2.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/progs/tests/texcompress2.c b/progs/tests/texcompress2.c
index cbb8f1d..b95aca9 100644
--- a/progs/tests/texcompress2.c
+++ b/progs/tests/texcompress2.c
@@ -51,7 +51,6 @@ TestSubTex(void)
    GLboolean all = 0*GL_TRUE;
    GLubyte *buffer;
    GLint size, fmt;
-   int i;
 
    glGetTexLevelParameteriv(Target, 0,
                             GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB, &size);
@@ -83,6 +82,23 @@ TestSubTex(void)
 
 
 static void
+TestGetTex(void)
+{
+   GLubyte *buffer;
+
+   buffer = (GLubyte *) malloc(3 * ImgWidth * ImgHeight);
+
+   glGetTexImage(GL_TEXTURE_2D,
+                 0,
+                 GL_RGB,
+                 GL_UNSIGNED_BYTE,
+                 buffer);
+
+   free(buffer);
+}
+
+
+static void
 LoadCompressedImage(const char *file)
 {
    const GLenum filter = GL_LINEAR;
@@ -146,7 +162,10 @@ LoadCompressedImage(const char *file)
    glTexParameteri(Target, GL_TEXTURE_MIN_FILTER, filter);
    glTexParameteri(Target, GL_TEXTURE_MAG_FILTER, filter);
 
-   TestSubTex();
+   if (0)
+      TestSubTex();
+   else
+      TestGetTex();
 
 }