From da8b6c35f6c3f6cedfdba26315b5c7aa23fdbf42 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Mon, 16 Jan 2006 01:23:55 +0000
Subject: [PATCH] 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
---
 stella/src/common/FrameBufferGL.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/stella/src/common/FrameBufferGL.cxx b/stella/src/common/FrameBufferGL.cxx
index a60381f88..9b232b13e 100644
--- a/stella/src/common/FrameBufferGL.cxx
+++ b/stella/src/common/FrameBufferGL.cxx
@@ -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.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
@@ -301,7 +301,9 @@ bool FrameBufferGL::createScreen()
 
   // Make sure any old parts of the screen are erased
   // Do it for both buffers!
-  cls();
+  p_glClear(GL_COLOR_BUFFER_BIT);
+  SDL_GL_SwapBuffers();
+  p_glClear(GL_COLOR_BUFFER_BIT);
 
   myOSystem->eventHandler().refreshDisplay();
 
@@ -564,12 +566,14 @@ void FrameBufferGL::enablePhosphor(bool enable)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FrameBufferGL::cls()
 {
+/* FIXME - commented out until I figure out why it crashes in OSX
   if(myFuncsLoaded)
   {
     p_glClear(GL_COLOR_BUFFER_BIT);
     SDL_GL_SwapBuffers();
     p_glClear(GL_COLOR_BUFFER_BIT);
   }
+*/
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -