The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2025-02-04 14:06:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup screenshot memory management. fixes preview image not displaying

Browse Source 
on gamecube
This commit is contained in:
Daryl Borth 2019-03-02 16:38:41 -07:00
parent f016b19cab
commit 6e1a197edd
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/menu.cpp
View File

@ -59,16 +59,10 @@ static GuiImageData * pointer[4];
#define MEM_ALLOC(A) (u8*)mem2_malloc(A) #define MEM_ALLOC(A) (u8*)mem2_malloc(A)
#define MEM_DEALLOC(A) mem2_free(A) #define MEM_DEALLOC(A) mem2_free(A)
#else
#ifdef USE_VM
#include "vmalloc.h"
#define MEM_ALLOC(A) (u8*)vm_malloc(A)
#define MEM_DEALLOC(A) vm_free(A)
#else #else
#define MEM_ALLOC(A) (u8*)memalign(32, A) #define MEM_ALLOC(A) (u8*)memalign(32, A)
#define MEM_DEALLOC(A) free(A) #define MEM_DEALLOC(A) free(A)
#endif #endif
#endif
static GuiTrigger * trigA = NULL; static GuiTrigger * trigA = NULL;
static GuiTrigger * trig2 = NULL; static GuiTrigger * trig2 = NULL;
@ -1562,8 +1556,7 @@ static int MenuGame()
delete gameScreenImg; delete gameScreenImg;
delete gameScreen; delete gameScreen;
gameScreen = NULL; gameScreen = NULL;
free(gameScreenPng); ClearScreenshot();
gameScreenPng = NULL;
if(GCSettings.AutoloadGame) { if(GCSettings.AutoloadGame) {
ExitApp(); ExitApp();
} }
@ -4400,11 +4393,7 @@ MainMenu (int menu)
if(gameScreen) if(gameScreen)
delete gameScreen; delete gameScreen;
if(gameScreenPng) ClearScreenshot();
{
free(gameScreenPng);
gameScreenPng = NULL;
}
// wait for keys to be depressed // wait for keys to be depressed
while(MenuRequested()) while(MenuRequested())

10
source/video.cpp
View File

@ -907,6 +907,16 @@ void TakeScreenshot()
} }
} }
void ClearScreenshot()
{
if(gameScreenPng)
{
gameScreenPngSize = 0;
free(gameScreenPng);
gameScreenPng = NULL;
}
}
/**************************************************************************** /****************************************************************************
* ResetVideo_Menu * ResetVideo_Menu
* *

1
source/video.h
View File

@ -25,6 +25,7 @@ void setGFX();
void update_video (int width, int height); void update_video (int width, int height);
void ResetVideo_Menu(); void ResetVideo_Menu();
void TakeScreenshot(); void TakeScreenshot();
void ClearScreenshot();
void Menu_Render(); void Menu_Render();
void Menu_DrawImg(f32 xpos, f32 ypos, u16 width, u16 height, u8 data[], f32 degrees, f32 scaleX, f32 scaleY, u8 alphaF ); void Menu_DrawImg(f32 xpos, f32 ypos, u16 width, u16 height, u8 data[], f32 degrees, f32 scaleX, f32 scaleY, u8 alphaF );
void Menu_DrawRectangle(f32 x, f32 y, f32 width, f32 height, GXColor color, u8 filled); void Menu_DrawRectangle(f32 x, f32 y, f32 width, f32 height, GXColor color, u8 filled);