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

fix GL_invalid_enum errror caused by my a mistake in my "PixelFormat cleanup" checkin

Browse Source
This commit is contained in:
Chris Danford
2005-10-02 03:35:56 +00:00
parent 18db70de2b
commit 07c0617f2d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+4 -1
View File
@@ -1624,7 +1624,7 @@ PixelFormat RageDisplay_OGL::GetImgPixelFormat( RageSurface* &img, bool &FreeImg
if( !bPalettedTexture && img->fmt.BytesPerPixel == 1 && !g_bColorIndexTableWorks ) if( !bPalettedTexture && img->fmt.BytesPerPixel == 1 && !g_bColorIndexTableWorks )
bSupported = false; bSupported = false;
if( pixfmt == NUM_PixelFormat || !SupportsSurfaceFormat(pixfmt) ) if( pixfmt == PixelFormat_INVALID || !SupportsSurfaceFormat(pixfmt) )
bSupported = false; bSupported = false;
if( !bSupported ) if( !bSupported )
@@ -1645,7 +1645,9 @@ PixelFormat RageDisplay_OGL::GetImgPixelFormat( RageSurface* &img, bool &FreeImg
FreeImg = true; FreeImg = true;
} }
else else
{
FreeImg = false; FreeImg = false;
}
return pixfmt; return pixfmt;
} }
@@ -1692,6 +1694,7 @@ unsigned RageDisplay_OGL::CreateTexture(
/* Find the pixel format of the image we've been given. */ /* Find the pixel format of the image we've been given. */
bool FreeImg; bool FreeImg;
PixelFormat imgpixfmt = GetImgPixelFormat( img, FreeImg, img->w, img->h, pixfmt == PixelFormat_PAL ); PixelFormat imgpixfmt = GetImgPixelFormat( img, FreeImg, img->w, img->h, pixfmt == PixelFormat_PAL );
ASSERT( imgpixfmt != PixelFormat_INVALID );
GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt; GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt;
GLenum glImageFormat = g_GLPixFmtInfo[imgpixfmt].format; GLenum glImageFormat = g_GLPixFmtInfo[imgpixfmt].format;