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

simplify, merge code

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-26 08:53:01 +00:00
parent cc55c46033
commit 618a6c7737
1 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+15 -38
View File
@@ -1714,6 +1714,19 @@ unsigned RageDisplay_OGL::CreateTexture(
{
ostringstream s;
s << bGenerateMipMaps? "gluBuild2DMipmaps":"glTexImage2D";
s << "(format " << GLToString(glTexFormat) <<
", " << img->w << "x" << img->h <<
", format " << GLToString(glImageFormat) <<
", type " << GLToString(glImageType) <<
", pixfmt " << pixfmt <<
", imgpixfmt " << imgpixfmt;
LOG->Trace( "%s", s.str().c_str() );
}
FlushGLErrors();
if( bGenerateMipMaps )
@@ -1722,19 +1735,7 @@ unsigned RageDisplay_OGL::CreateTexture(
GL_TEXTURE_2D, glTexFormat,
img->w, img->h,
glImageFormat, glImageType, img->pixels );
if( error != 0 )
{
ostringstream s;
s << "gluBuild2DMipmaps(format " << GLToString(glTexFormat) <<
", w " << img->w << ", h " << img->h <<
", format " << GLToString(glImageFormat) <<
", type " << GLToString(glImageType) <<
"): " << gluErrorString(error);
LOG->Trace( s.str().c_str() );
ASSERT(0);
}
ASSERT_M( error == 0, (char *) gluErrorString(error) );
}
else
{
@@ -1743,35 +1744,11 @@ unsigned RageDisplay_OGL::CreateTexture(
img->w, img->h, 0,
glImageFormat, glImageType, img->pixels);
{
ostringstream s;
s << "glTexImage2D(format " << GLToString(glTexFormat) <<
", " << img->w << "x" << img->h <<
", format " << GLToString(glImageFormat) <<
", type " << GLToString(glImageType) <<
", pixfmt " << pixfmt <<
", imgpixfmt " << imgpixfmt;
LOG->Trace( s.str().c_str() );
}
GLenum error = glGetError();
if( error != GL_NO_ERROR )
{
ostringstream s;
s << "glTexImage2D(format " << GLToString(glTexFormat) <<
", " << img->w << "x" << img->h <<
", format " << GLToString(glImageFormat) <<
", type " << GLToString(glImageType) <<
", pixfmt " << pixfmt <<
", imgpixfmt " << imgpixfmt <<
"): " << GLToString(error);
LOG->Trace( s.str().c_str() );
ASSERT(0);
}
ASSERT_M( error == GL_NO_ERROR, GLToString(error) );
}
/* Sanity check: */
if( pixfmt == FMT_PAL )
{