diff options
| author | Eric Anholt <eric@anholt.net> | 2009-10-23 14:19:52 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-23 15:21:05 -0700 |
| commit | 49d402e275cdaf46de8db5a475dfe00509141195 (patch) | |
| tree | e5d17e8b69c1c0c8e96b43b70d8fcb09d077c942 /progs | |
| parent | bfd51dc34d45ba584683c70b1f854a513d9104d3 (diff) | |
| parent | 2d17dbfb5346b6d75e87c839148cbe125bf5cd6d (diff) | |
Merge remote branch 'origin/mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/tests/texcmp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/progs/tests/texcmp.c b/progs/tests/texcmp.c index d1e829d1b7..45935e19a3 100644 --- a/progs/tests/texcmp.c +++ b/progs/tests/texcmp.c @@ -149,7 +149,7 @@ static void Reshape( int width, int height ) static void ReInit( GLenum TC, TEXTURE *Tx ) { - GLint rv; + GLint rv, v; if ((Tx->TC == TC) && (Tx->cData != NULL)) { glCompressedTexImage2DARB(GL_TEXTURE_2D, /* target */ @@ -170,6 +170,12 @@ static void ReInit( GLenum TC, TEXTURE *Tx ) GL_UNSIGNED_BYTE, /* texture type */ Tx->data); /* the texture */ + + v = 0; + glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, + GL_TEXTURE_INTERNAL_FORMAT, &v); + printf("Requested internal format = 0x%x, actual = 0x%x\n", TC, v); + /* okay, now cache the compressed texture */ Tx->TC = TC; if (Tx->cData != NULL) { |