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

Fix for FrameBuffer::cls() crash in OSX. I don't think we really need 

the functionality in OpenGL anyway.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@968 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-01-16 01:23:55 +00:00
parent 5a5151def7
commit da8b6c35f6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FrameBufferGL.cxx,v 1.54 2006-01-15 22:43:21 stephena Exp $ // $Id: FrameBufferGL.cxx,v 1.55 2006-01-16 01:23:55 stephena Exp $
//============================================================================ //============================================================================
#ifdef DISPLAY_OPENGL #ifdef DISPLAY_OPENGL
@ -301,7 +301,9 @@ bool FrameBufferGL::createScreen()
// Make sure any old parts of the screen are erased // Make sure any old parts of the screen are erased
// Do it for both buffers! // Do it for both buffers!
cls(); p_glClear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapBuffers();
p_glClear(GL_COLOR_BUFFER_BIT);
myOSystem->eventHandler().refreshDisplay(); myOSystem->eventHandler().refreshDisplay();
@ -564,12 +566,14 @@ void FrameBufferGL::enablePhosphor(bool enable)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBufferGL::cls() void FrameBufferGL::cls()
{ {
/* FIXME - commented out until I figure out why it crashes in OSX
if(myFuncsLoaded) if(myFuncsLoaded)
{ {
p_glClear(GL_COLOR_BUFFER_BIT); p_glClear(GL_COLOR_BUFFER_BIT);
SDL_GL_SwapBuffers(); SDL_GL_SwapBuffers();
p_glClear(GL_COLOR_BUFFER_BIT); p_glClear(GL_COLOR_BUFFER_BIT);
} }
*/
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -