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

better paletted textures checking

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-13 18:04:31 +00:00
parent 576a3aab8b
commit 07df38b58f
1 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+31 -16
View File
@@ -431,12 +431,21 @@ static void CheckPalettedTextures( bool LowColor )
}
FlushGLErrors();
CString error;
#define GL_CHECK_ERROR(f) \
{ \
GLenum glError = glGetError(); \
if( glError != GL_NO_ERROR ) { \
error = ssprintf(f " failed (%s)", GLToString(glError).c_str() ); \
goto fail; \
} \
}
glTexImage2D(GL_PROXY_TEXTURE_2D,
0, glTexFormat,
16, 16, 0,
glImageFormat, glImageType, NULL);
CString error;
GL_CHECK_ERROR( "glTexImage2D" );
{
GLuint ifmt = 0;
@@ -450,23 +459,10 @@ static void CheckPalettedTextures( bool LowColor )
}
}
GLenum glError;
glError = glGetError();
if( glError != GL_NO_ERROR )
{
error = ssprintf("glTexImage2D failed (%s)", GLToString(glError).c_str() );
goto fail;
}
GLubyte palette[256*4];
memset(palette, 0, sizeof(palette));
GLExt::glColorTableEXT(GL_PROXY_TEXTURE_2D, GL_RGBA8, 1 << bits, GL_RGBA, GL_UNSIGNED_BYTE, palette);
glError = glGetError();
if( glError != GL_NO_ERROR )
{
error = ssprintf("glColorTableEXT failed (%s)", GLToString(glError).c_str() );
goto fail;
}
GL_CHECK_ERROR( "glColorTableEXT" );
{ // in brackets to hush VC6 error
GLint size = 0;
@@ -476,6 +472,24 @@ static void CheckPalettedTextures( bool LowColor )
error = ssprintf("Expected %i-bit palette, got a %i-bit one instead", bits, size);
goto fail;
}
GLint RealWidth = 0;
GLExt::glGetColorTableParameterivEXT(GL_PROXY_TEXTURE_2D, GL_COLOR_TABLE_WIDTH_EXT, &RealWidth);
GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_WIDTH_EXT)" );
if( RealWidth != 1 << bits )
{
error = ssprintf("GL_COLOR_TABLE_WIDTH_EXT returned %i instead of %i", RealWidth, 1 << bits );
goto fail;
}
GLint RealFormat = 0;
GLExt::glGetColorTableParameterivEXT(GL_PROXY_TEXTURE_2D, GL_COLOR_TABLE_FORMAT, &RealFormat);
GL_CHECK_ERROR( "glGetColorTableParameterivEXT(GL_COLOR_TABLE_FORMAT)" );
if( RealFormat != GL_RGBA8 )
{
error = ssprintf("GL_COLOR_TABLE_FORMAT returned %s instead of GL_RGBA8", GLToString(RealFormat).c_str() );
goto fail;
}
}
return;
@@ -493,6 +507,7 @@ fail:
GLExt::glGetColorTableParameterivEXT = NULL;
LOG->Info("Paletted textures disabled: %s.", error.c_str());
}
#undef GL_CHECK_ERROR
}
static void CheckReversePackedPixels()