actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

improve CheckPalettedTextures output

Browse Source
This commit is contained in:
Glenn Maynard
2004-03-13 06:42:07 +00:00
parent 88c869da6a
commit c39201efcd
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+14 -3
View File
@@ -453,8 +453,19 @@ bool HasExtension(CString ext)
static void CheckPalettedTextures( bool LowColor ) static void CheckPalettedTextures( bool LowColor )
{ {
if( !GLExt::glColorTableEXT || !GLExt::glGetColorTableParameterivEXT ) CString error;
return;
if( GLExt::glColorTableEXT == NULL )
{
error = "glColorTableEXT missing";
goto fail;
}
if( GLExt::glGetColorTableParameterivEXT == NULL )
{
error = "glGetColorTableParameterivEXT missing";
goto fail;
}
/* Check to see if paletted textures really work. */ /* Check to see if paletted textures really work. */
GLenum glTexFormat = GL_PIXFMT_INFO[RageDisplay::FMT_PAL].internalfmt; GLenum glTexFormat = GL_PIXFMT_INFO[RageDisplay::FMT_PAL].internalfmt;
@@ -470,7 +481,6 @@ static void CheckPalettedTextures( bool LowColor )
} }
FlushGLErrors(); FlushGLErrors();
CString error;
#define GL_CHECK_ERROR(f) \ #define GL_CHECK_ERROR(f) \
{ \ { \
GLenum glError = glGetError(); \ GLenum glError = glGetError(); \
@@ -506,6 +516,7 @@ static void CheckPalettedTextures( bool LowColor )
{ // in brackets to hush VC6 error { // in brackets to hush VC6 error
GLint size = 0; GLint size = 0;
glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GLenum(GL_TEXTURE_INDEX_SIZE_EXT), &size); glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GLenum(GL_TEXTURE_INDEX_SIZE_EXT), &size);
GL_CHECK_ERROR( "glGetTexLevelParameteriv(GL_TEXTURE_INDEX_SIZE_EXT)" );
if( bits > size || size > 8 ) if( bits > size || size > 8 )
{ {
error = ssprintf("Expected %i-bit palette, got a %i-bit one instead", bits, int(size)); error = ssprintf("Expected %i-bit palette, got a %i-bit one instead", bits, int(size));