thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRIM: Fix memory leaks related to the emergency built-in font

Browse source
This commit is contained in:
Bastien Bouclet 2016-07-12 06:08:21 +02:00
parent 73e6ae888d
commit 62bf521944
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/grim/gfx_opengl.cpp
View file

@ -143,9 +143,6 @@ byte *GfxOpenGL::setupScreen(int screenW, int screenH, bool fullscreen) {
g_system->setWindowCaption("ResidualVM: OpenGL Renderer"); g_system->setWindowCaption("ResidualVM: OpenGL Renderer");
// Load emergency built-in font
loadEmergFont();
int screenSize = _screenWidth * _screenHeight * 4; int screenSize = _screenWidth * _screenHeight * 4;
_storedDisplay = new byte[screenSize]; _storedDisplay = new byte[screenSize];
memset(_storedDisplay, 0, screenSize); memset(_storedDisplay, 0, screenSize);

4
engines/grim/gfx_opengl_shaders.cpp
View file

@ -257,6 +257,7 @@ GfxOpenGLS::~GfxOpenGLS() {
delete _dimPlaneProgram; delete _dimPlaneProgram;
delete _dimRegionProgram; delete _dimRegionProgram;
glDeleteTextures(1, &_storedDisplay); glDeleteTextures(1, &_storedDisplay);
glDeleteTextures(1, &_emergTexture);
} }
void GfxOpenGLS::setupZBuffer() { void GfxOpenGLS::setupZBuffer() {
@ -422,9 +423,6 @@ byte *GfxOpenGLS::setupScreen(int screenW, int screenH, bool fullscreen) {
setupZBuffer(); setupZBuffer();
setupShaders(); setupShaders();
// Load emergency built-in font
loadEmergFont();
glViewport(0, 0, _screenWidth, _screenHeight); glViewport(0, 0, _screenWidth, _screenHeight);
glGenTextures(1, &_storedDisplay); glGenTextures(1, &_storedDisplay);

2
engines/grim/grim.cpp
View file

@ -273,6 +273,7 @@ GfxBase *GrimEngine::createRenderer(int screenW, int screenH) {
} }
renderer->setupScreen(screenW, screenH, fullscreen); renderer->setupScreen(screenW, screenH, fullscreen);
renderer->loadEmergFont();
return renderer; return renderer;
} }
@ -346,7 +347,6 @@ Common::Error GrimEngine::run() {
g_sound = new SoundPlayer(); g_sound = new SoundPlayer();
g_driver = createRenderer(640, 480); g_driver = createRenderer(640, 480);
g_driver->loadEmergFont();
if (getGameType() == GType_MONKEY4 && SearchMan.hasFile("AMWI.m4b")) { if (getGameType() == GType_MONKEY4 && SearchMan.hasFile("AMWI.m4b")) {
// Play EMI Mac Aspyr logo // Play EMI Mac Aspyr logo