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

reduce conversions

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-22 04:18:02 +00:00
parent 570bea0659
commit 0fcf0b8ab1
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/SDL_utils.cpp
+7 -23
View File
@@ -140,6 +140,7 @@ void mySDL_GetBitsPerChannel(const SDL_PixelFormat *fmt, Uint32 bits[4])
bits[2] = 8 - fmt->Bloss;
bits[3] = 8 - fmt->Aloss;
}
#include "RageLog.h"
void ConvertSDLSurface(SDL_Surface *&image,
int width, int height, int bpp,
@@ -149,35 +150,18 @@ void ConvertSDLSurface(SDL_Surface *&image,
SDL_SWSURFACE, width, height, bpp, R, G, B, A);
ASSERT(ret_image != NULL);
/* If the formats are the same, no conversion is needed. */
/* if(width == image->w && height == image->h &&
/* If the formats are the same, no conversion is needed. One exception:
* if we have a color key and we're not paletted (8-bit). (If we have
* a color key but we're paletted, we'll handle this on texture load.) xxx unimplemented */
if(!(image->flags & SDL_SRCCOLORKEY) &&
width == image->w && height == image->h &&
!memcmp(image->format, ret_image->format, sizeof(SDL_PixelFormat)))
{
LOG->Trace("noconv");
SDL_FreeSurface(ret_image);
return;
}
It's needed because of the color key; the blit converts it to alpha. (Gah.) */
/* I'd really like to do away with this, but a lot of song images use it.
* I suppose this should be yet another hint, but they're getting cumbersome ... */
if(!(image->flags & SDL_SRCCOLORKEY)) {
/* Annoying: SDL will do a nearest-match on paletted images if
* they don't have the color we ask for, so images without HOT PINK
* will get some other random color transparent; so we have to make
* sure the value returned for paletted images is exactly #FF00FF. */
int color = SDL_MapRGB(image->format, 0xFF, 0, 0xFF);
if( image->format->BitsPerPixel == 8 ) {
if(image->format->palette->colors[color].r != 0xFF ||
image->format->palette->colors[color].g != 0x00 ||
image->format->palette->colors[color].b != 0xFF )
color = -1;
}
if( color != -1 )
SDL_SetColorKey( image, SDL_SRCCOLORKEY, color);
}
/* We don't want to actually blend the alpha channel over the destination converted
* surface; we want to simply blit it, so make sure SDL_SRCALPHA is not on. */
SDL_SetAlpha( image, 0, SDL_ALPHA_OPAQUE );