mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-09 18:39:45 +01:00
Code Issues Releases Wiki Activity

Don't hardcode SDL_CreateRGBSurface BitsPerPixel/mask args

Browse source 
For some reason, GetSubSurface() and ApplyFilter() were hardcoding the
bits-per-pixel and/or mask arguments to SDL_CreateRGBSurface(). I've
made them simply re-use the bits-per-pixel and masks of the input
surfaces they operate on, but the bits-per-pixel should always be 32 and
masks should always go first-byte alpha, second-byte red, third-byte
green, fourth-byte blue.
This commit is contained in:
Misa 2020-08-22 18:52:42 -07:00 committed by Ethan Lee
parent 8af9007b5f
commit 760f1e8e5a
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
desktop_version/src/GraphicsUtil.cpp
View file

@ -20,15 +20,17 @@ SDL_Surface* GetSubSurface( SDL_Surface* metaSurface, int x, int y, int width, i
area.w = width; area.w = width;
area.h = height; area.h = height;
// Set the RGBA mask values.
Uint32 r, g, b, a;
r = 0x000000ff;
g = 0x0000ff00;
b = 0x00ff0000;
a = 0xff000000;
//Convert to the correct display format after nabbing the new _surface or we will slow things down. //Convert to the correct display format after nabbing the new _surface or we will slow things down.
SDL_Surface* preSurface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, 32, r, g, b, a); SDL_Surface* preSurface = SDL_CreateRGBSurface(
SDL_SWSURFACE,
width,
height,
metaSurface->format->BitsPerPixel,
metaSurface->format->Rmask,
metaSurface->format->Gmask,
metaSurface->format->Bmask,
metaSurface->format->Amask
);
//SDL_Surface* subSurface = SDL_DisplayFormatAlpha(preSurface); //SDL_Surface* subSurface = SDL_DisplayFormatAlpha(preSurface);
//SDL_FreeSurface(preSurface); //SDL_FreeSurface(preSurface);
@ -337,7 +339,7 @@ void UpdateFilter()
SDL_Surface* ApplyFilter( SDL_Surface* _src ) SDL_Surface* ApplyFilter( SDL_Surface* _src )
{ {
SDL_Surface* _ret = SDL_CreateRGBSurface(_src->flags, _src->w, _src->h, 32, SDL_Surface* _ret = SDL_CreateRGBSurface(_src->flags, _src->w, _src->h, _src->format->BitsPerPixel,
_src->format->Rmask, _src->format->Gmask, _src->format->Bmask, _src->format->Amask); _src->format->Rmask, _src->format->Gmask, _src->format->Bmask, _src->format->Amask);
int redOffset = rand() % 4; int redOffset = rand() % 4;