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

clarify

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-01 07:44:33 +00:00
parent 2b6f94ba10
commit ec04b7eb9c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+9 -9
View File
@@ -1722,14 +1722,14 @@ unsigned RageDisplay_OGL::CreateTexture(
ASSERT( pImg->w == power_of_two(pImg->w) && pImg->h == power_of_two(pImg->h) ); ASSERT( pImg->w == power_of_two(pImg->w) && pImg->h == power_of_two(pImg->h) );
/* Find the pixel format of the image we've been given. */ /* Find the pixel format of the surface we've been given. */
bool bFreeImg; bool bFreeImg;
PixelFormat imgpixfmt = GetImgPixelFormat( pImg, bFreeImg, pImg->w, pImg->h, pixfmt == PixelFormat_PAL ); PixelFormat SurfacePixFmt = GetImgPixelFormat( pImg, bFreeImg, pImg->w, pImg->h, pixfmt == PixelFormat_PAL );
ASSERT( imgpixfmt != PixelFormat_INVALID ); ASSERT( SurfacePixFmt != PixelFormat_INVALID );
GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt; GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt;
GLenum glImageFormat = g_GLPixFmtInfo[imgpixfmt].format; GLenum glImageFormat = g_GLPixFmtInfo[SurfacePixFmt].format;
GLenum glImageType = g_GLPixFmtInfo[imgpixfmt].type; GLenum glImageType = g_GLPixFmtInfo[SurfacePixFmt].type;
/* If the image is paletted, but we're not sending it to a paletted image, /* If the image is paletted, but we're not sending it to a paletted image,
* set up glPixelMap. */ * set up glPixelMap. */
@@ -1824,7 +1824,7 @@ unsigned RageDisplay_OGL::CreateTexture(
", format " << GLToString(glImageFormat) << ", format " << GLToString(glImageFormat) <<
", type " << GLToString(glImageType) << ", type " << GLToString(glImageType) <<
", pixfmt " << pixfmt << ", pixfmt " << pixfmt <<
", imgpixfmt " << imgpixfmt << ", imgpixfmt " << SurfacePixFmt <<
")"; ")";
LOG->Trace( "%s", s.str().c_str() ); LOG->Trace( "%s", s.str().c_str() );
} }
@@ -1878,13 +1878,13 @@ void RageDisplay_OGL::UpdateTexture(
glBindTexture( GL_TEXTURE_2D, uTexHandle ); glBindTexture( GL_TEXTURE_2D, uTexHandle );
bool bFreeImg; bool bFreeImg;
PixelFormat pixfmt = GetImgPixelFormat( pImg, bFreeImg, iWidth, iHeight, false ); PixelFormat SurfacePixFmt = GetImgPixelFormat( pImg, bFreeImg, iWidth, iHeight, false );
glPixelStorei( GL_UNPACK_ROW_LENGTH, pImg->pitch / pImg->format->BytesPerPixel ); glPixelStorei( GL_UNPACK_ROW_LENGTH, pImg->pitch / pImg->format->BytesPerPixel );
// GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt; // GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt;
GLenum glImageFormat = g_GLPixFmtInfo[pixfmt].format; GLenum glImageFormat = g_GLPixFmtInfo[SurfacePixFmt].format;
GLenum glImageType = g_GLPixFmtInfo[pixfmt].type; GLenum glImageType = g_GLPixFmtInfo[SurfacePixFmt].type;
glTexSubImage2D( GL_TEXTURE_2D, 0, glTexSubImage2D( GL_TEXTURE_2D, 0,
iXOffset, iYOffset, iXOffset, iYOffset,