Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-03-03 05:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug 4484 - use SIMD aligned memory for SDL_Surface

Browse Source 
Surfaces are allocated using SDL_SIMDAlloc()
They are marked with SDL_SIMD_ALIGNED flag to appropriatly free them with SDL_SIMDFree()
(Flag is cleared when pixels is free'd in RLE, in case user would hijack the pixels ptr)

When providing its own memory pointer (SDL_CreateRGBSurfaceFrom()) and clearing
SDL_PREALLOC  to delegate to SDL the memory free, it's the responsability of the user
to add SDL_SIMD_ALIGNED or not, whether the pointer has been allocated with SDL_malloc() or
SDL_SIMDAlloc().
This commit is contained in:
Sylvain Becker 2019-02-04 09:11:07 +01:00
parent 9292dc7ca1
commit 670f3d3327
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/SDL_RLEaccel.c
View File

@ -89,6 +89,7 @@
#include "SDL_sysvideo.h" #include "SDL_sysvideo.h"
#include "SDL_blit.h" #include "SDL_blit.h"
#include "SDL_RLEaccel_c.h" #include "SDL_RLEaccel_c.h"
#include "../cpuinfo/SDL_simd.h"
#ifndef MIN #ifndef MIN
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
@ -1220,8 +1221,9 @@ RLEAlphaSurface(SDL_Surface * surface)
/* Now that we have it encoded, release the original pixels */ /* Now that we have it encoded, release the original pixels */
if (!(surface->flags & SDL_PREALLOC)) { if (!(surface->flags & SDL_PREALLOC)) {
SDL_free(surface->pixels); SDL_SIMDFree(surface->pixels);
surface->pixels = NULL; surface->pixels = NULL;
surface->flags &= ~SDL_SIMD_ALIGNED;
} }
/* realloc the buffer to release unused memory */ /* realloc the buffer to release unused memory */
@ -1383,8 +1385,9 @@ RLEColorkeySurface(SDL_Surface * surface)
/* Now that we have it encoded, release the original pixels */ /* Now that we have it encoded, release the original pixels */
if (!(surface->flags & SDL_PREALLOC)) { if (!(surface->flags & SDL_PREALLOC)) {
SDL_free(surface->pixels); SDL_SIMDFree(surface->pixels);
surface->pixels = NULL; surface->pixels = NULL;
surface->flags &= ~SDL_SIMD_ALIGNED;
} }
/* realloc the buffer to release unused memory */ /* realloc the buffer to release unused memory */
@ -1484,10 +1487,11 @@ UnRLEAlpha(SDL_Surface * surface)
uncopy_opaque = uncopy_transl = uncopy_32; uncopy_opaque = uncopy_transl = uncopy_32;
} }
surface->pixels = SDL_malloc(surface->h * surface->pitch); surface->pixels = SDL_SIMDAlloc(surface->h * surface->pitch);
if (!surface->pixels) { if (!surface->pixels) {
return (SDL_FALSE); return (SDL_FALSE);
} }
surface->flags |= SDL_SIMD_ALIGNED;
/* fill background with transparent pixels */ /* fill background with transparent pixels */
SDL_memset(surface->pixels, 0, surface->h * surface->pitch); SDL_memset(surface->pixels, 0, surface->h * surface->pitch);
@ -1549,12 +1553,13 @@ SDL_UnRLESurface(SDL_Surface * surface, int recode)
SDL_Rect full; SDL_Rect full;
/* re-create the original surface */ /* re-create the original surface */
surface->pixels = SDL_malloc(surface->h * surface->pitch); surface->pixels = SDL_SIMDAlloc(surface->h * surface->pitch);
if (!surface->pixels) { if (!surface->pixels) {
/* Oh crap... */ /* Oh crap... */
surface->flags |= SDL_RLEACCEL; surface->flags |= SDL_RLEACCEL;
return; return;
} }
surface->flags |= SDL_SIMD_ALIGNED;
/* fill it with the background color */ /* fill it with the background color */
SDL_FillRect(surface, NULL, surface->map->info.colorkey); SDL_FillRect(surface, NULL, surface->map->info.colorkey);

3
src/video/SDL_surface.c
View File

@ -120,12 +120,13 @@ SDL_CreateRGBSurfaceWithFormat(Uint32 flags, int width, int height, int depth,
return NULL; return NULL;
} }
surface->pixels = SDL_malloc((size_t)size); surface->pixels = SDL_SIMDAlloc((size_t)size);
if (!surface->pixels) { if (!surface->pixels) {
SDL_FreeSurface(surface); SDL_FreeSurface(surface);
SDL_OutOfMemory(); SDL_OutOfMemory();
return NULL; return NULL;
} }
surface->flags |= SDL_SIMD_ALIGNED;
/* This is important for bitmaps */ /* This is important for bitmaps */
SDL_memset(surface->pixels, 0, surface->h * surface->pitch); SDL_memset(surface->pixels, 0, surface->h * surface->pitch);
} }