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

Allow passing a surface with no data and non-power-of-two dimensions.

Browse Source 
A power-of-two texture will be created and not initialized.
This commit is contained in:
Glenn Maynard
2007-03-21 04:51:47 +00:00
parent a4fbd6f19b
commit 504866debb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+7 -3
View File
@@ -1963,7 +1963,6 @@ unsigned RageDisplay_OGL::CreateTexture(
bool bGenerateMipMaps ) bool bGenerateMipMaps )
{ {
ASSERT( pixfmt < NUM_PixelFormat ); ASSERT( pixfmt < NUM_PixelFormat );
ASSERT( pImg->w == power_of_two(pImg->w) && pImg->h == power_of_two(pImg->h) );
/* Find the pixel format of the surface we've been given. */ /* Find the pixel format of the surface we've been given. */
@@ -2089,8 +2088,13 @@ unsigned RageDisplay_OGL::CreateTexture(
{ {
glTexImage2D( glTexImage2D(
GL_TEXTURE_2D, 0, glTexFormat, GL_TEXTURE_2D, 0, glTexFormat,
pImg->w, pImg->h, 0, power_of_two(pImg->w), power_of_two(pImg->h), 0,
glImageFormat, glImageType, pImg->pixels); glImageFormat, glImageType, NULL );
if( pImg->pixels )
glTexSubImage2D( GL_TEXTURE_2D, 0,
0, 0,
pImg->w, pImg->h,
glImageFormat, glImageType, pImg->pixels );
GLenum error = glGetError(); GLenum error = glGetError();
ASSERT_M( error == GL_NO_ERROR, GLToString(error) ); ASSERT_M( error == GL_NO_ERROR, GLToString(error) );