ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix allocations of formerly 32-byte aligned buffers to once more be 32-byte aligned. not 100% sure I did this right...

This commit is contained in:
zeromus 2015-06-14 21:07:20 +00:00
parent e95c176f82
commit c7cbf47472
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
desmume/src/GPU.cpp
View File

@ -54,7 +54,11 @@ GPU::MosaicLookup GPU::mosaicLookup;
//#define DEBUG_TRI
//this value should be 32-byte aligned
u16 *GPU_screen = NULL;
//and this is the raw pointer
u16 *GPU_screen_raw = NULL;
static size_t _gpuFramebufferWidth = 256;
static size_t _gpuFramebufferHeight = 192;
@ -255,8 +259,9 @@ void GPU_DeInit(GPU *gpu)
{
if (gpu == &GPU_main || gpu == &GPU_sub) return;
free(gpu->tempScanlineBuffer);
free(gpu->tempScanlineBufferRaw);
gpu->tempScanlineBuffer = NULL;
gpu->tempScanlineBufferRaw = NULL;
free(gpu->bgPixels);
gpu->bgPixels = NULL;
@ -1952,7 +1957,8 @@ void Screen_DeInit(void)
delete osd;
osd = NULL;
free(GPU_screen);
free(GPU_screen_raw);
GPU_screen_raw = NULL;
GPU_screen = NULL;
free(win_empty);
@ -1981,12 +1987,15 @@ void GPU_SetFramebufferSize(size_t w, size_t h)
_gpuFramebufferWidth = w;
_gpuFramebufferHeight = h;
GPU_screen = (u16 *)realloc(GPU_screen, w * h * sizeof(u16) * 2);
GPU_screen_raw = (u16 *)realloc(GPU_screen_raw, w * h * sizeof(u16) * 2 + 32);
GPU_screen = (u16*)(((uintptr_t)GPU_screen_raw+32) & ~31);
MainScreen.offset = 0;
SubScreen.offset = _gpuFramebufferHeight;
MainScreen.gpu->tempScanlineBuffer = (u16 *)realloc(MainScreen.gpu->tempScanlineBuffer, w * lineCount * sizeof(u16));
SubScreen.gpu->tempScanlineBuffer = (u16 *)realloc(SubScreen.gpu->tempScanlineBuffer, w * lineCount * sizeof(u16));
MainScreen.gpu->tempScanlineBufferRaw = (u16 *)realloc(MainScreen.gpu->tempScanlineBufferRaw, w * lineCount * sizeof(u16) + 32);
SubScreen.gpu->tempScanlineBufferRaw = (u16 *)realloc(SubScreen.gpu->tempScanlineBufferRaw, w * lineCount * sizeof(u16) + 32);
MainScreen.gpu->tempScanlineBuffer = (u16*)(((uintptr_t)MainScreen.gpu->tempScanlineBufferRaw+32) & ~31);
SubScreen.gpu->tempScanlineBuffer = (u16*)(((uintptr_t)SubScreen.gpu->tempScanlineBufferRaw+32) & ~31);
MainScreen.gpu->bgPixels = (u8 *)realloc(MainScreen.gpu->bgPixels, w * lineCount * 4 * sizeof(u8)); // yes indeed, this is oversized. map debug tools try to write to it
SubScreen.gpu->bgPixels = (u8 *)realloc(SubScreen.gpu->bgPixels, w * lineCount * 4 * sizeof(u8)); // yes indeed, this is oversized. map debug tools try to write to it

5
desmume/src/GPU.h
View File

@ -704,8 +704,11 @@ struct GPU
u16 *currentFadeInColors, *currentFadeOutColors;
bool blend2[8];
//CACHE_ALIGN u16 tempScanlineBuffer[256];
//this should be suitably aligned for SSE2 (32bytes)
u16 *tempScanlineBuffer;
//this is the raw unadjusted pointer
u16 *tempScanlineBufferRaw;
u16 *tempScanline;
GPUMasterBrightMode MasterBrightMode;