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

Hopefully fix the OpenGL crash bug in OSX. I still don't know what's 

causing it, but it seems to be related to cls().


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1224 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-12-18 18:35:26 +00:00
parent 025d8b9cdd
commit 761afadb1c
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stella/src/common/FrameBufferGL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: FrameBufferGL.cxx,v 1.76 2006-12-13 22:46:28 stephena Exp $
// $Id: FrameBufferGL.cxx,v 1.77 2006-12-18 18:35:26 stephena Exp $
//============================================================================
#ifdef DISPLAY_OPENGL
@ -322,7 +322,9 @@ bool FrameBufferGL::createScreen()
createTextures();
// Make sure any old parts of the screen are erased
cls();
p_glClear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapBuffers();
p_glClear(GL_COLOR_BUFFER_BIT);
return true;
}
@ -573,12 +575,6 @@ void FrameBufferGL::enablePhosphor(bool enable, int blend)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBufferGL::cls()
{
if(myFuncsLoaded && myTexture)
{
p_glClear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapBuffers();
p_glClear(GL_COLOR_BUFFER_BIT);
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
stella/src/macosx/SettingsMACOSX.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES.
//
// $Id: SettingsMACOSX.cxx,v 1.15 2006-12-15 20:22:29 stephena Exp $
// $Id: SettingsMACOSX.cxx,v 1.16 2006-12-18 18:35:26 stephena Exp $
//============================================================================
#include <cassert>
@ -58,7 +58,7 @@ void SettingsMACOSX::loadConfig()
char cvalue[2048];
// Check if the settings plist file is valid
prefsGetString("plist_version", cvalue);
prefsGetString("stella_version", cvalue);
if(cvalue[0] == 0 || string(cvalue) < string(STELLA_SETTINGS_VERSION))
return;
@ -76,7 +76,7 @@ void SettingsMACOSX::loadConfig()
void SettingsMACOSX::saveConfig()
{
// Write out plist version
prefsSetString("plist_version", STELLA_VERSION);
prefsSetString("stella_version", STELLA_VERSION);
// Write out each of the key and value pairs
const SettingsArray& settings = getInternalSettings();