Finally getting a chance to look at the OpenGL stuff again.

Fixed crash when displaying 'popup' messages with OpenGL.

Changed OpenGL internal format to be the same as OSX.  Based on my
experimentation and research, this is the fastest format independent
of the platform/operating system.

Updated TODO marking the reload ROM listing functionality as being
complete.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1556 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

stella/Todo.txt

@@ -50,7 +50,7 @@ Stephen Anthony at stephena@users.sourceforge.net.
 
      (3) Have time between keypresses be configurable when jumping to files.
 
-     (4) Reload current listing (possibly tied to a RMB context menu).
+X    (4) Reload current listing (possibly tied to a RMB context menu).
 
      (5) Add commandline argument to toggle launcher use.
 

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.108 2008-11-30 17:28:03 stephena Exp $
+// $Id: FrameBufferGL.cxx,v 1.109 2008-12-04 16:53:26 stephena Exp $
 //============================================================================
 
 #ifdef DISPLAY_OPENGL
@@ -434,11 +434,11 @@ void FrameBufferGL::postFrameUpdate()
 static int FCOUNT = 0;
   if(myDirtyFlag)
   {
-cerr << "  SWAP buffers\n";
+//cerr << "  SWAP buffers\n";
     // Now show all changes made to the texture
     SDL_GL_SwapBuffers();
     myDirtyFlag = false;
-	cerr << FCOUNT++ << " : SWAP buffers" << endl;
+//	cerr << FCOUNT++ << " : SWAP buffers" << endl;
   }
 }
 
@@ -543,18 +543,12 @@ FBSurfaceGL::FBSurfaceGL(FrameBufferGL& buffer,
     myTexCoord[3] = (GLfloat) baseHeight / myTexHeight;
   }
 
-  // Create a texture that best suits the current display depth and system
+  // Based on experimentation, the following is the fastest 16-bit
-  // This code needs to be Apple-specific, otherwise performance is
+  // format for OpenGL (on all platforms)
-  // terrible on a Mac Mini
+  // TODO - make sure this is endian-clean
-#if defined(MAC_OSX)
   myTexture = SDL_CreateRGBSurface(SDL_SWSURFACE,
                 myTexWidth, myTexHeight, 16,
                 0x00007c00, 0x000003e0, 0x0000001f, 0x00000000);
-#else
-  myTexture = SDL_CreateRGBSurface(SDL_SWSURFACE,
-                myTexWidth, myTexHeight, 16,
-                0x0000f800, 0x000007e0, 0x0000001f, 0x00000000);
-#endif
 
   switch(myTexture->format->BytesPerPixel)
   {
@@ -597,15 +591,10 @@ FBSurfaceGL::FBSurfaceGL(FrameBufferGL& buffer,
 
   // Finally, create the texture in the most optimal format
   GLenum tex_intformat;
-#if defined (MAC_OSX)
+  tex_intformat = GL_RGB5;
-  tex_intformat   = GL_RGB5;
+  myTexFormat   = GL_BGRA;
-  myTexFormat = GL_BGRA;
+  myTexType     = GL_UNSIGNED_SHORT_1_5_5_5_REV;
-  myTexType   = GL_UNSIGNED_SHORT_1_5_5_5_REV;
+
-#else
-  tex_intformat   = GL_RGB;
-  myTexFormat = GL_RGB;
-  myTexType   = GL_UNSIGNED_SHORT_5_6_5;
-#endif
   p_glTexImage2D(myTexTarget, 0, tex_intformat,
                  myTexWidth, myTexHeight, 0,
                  myTexFormat, myTexType, myTexture->pixels);
@@ -738,11 +727,37 @@ void FBSurfaceGL::setPos(uInt32 x, uInt32 y)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceGL::setWidth(uInt32 w)
 {
+//cerr << "  BEFORE: w = " << myWidth <<", texcoord[2] = " << myTexCoord[2] << endl;
+
+  // This method can't be used with 'scaled' surface (aka TIA surfaces)
+  // That shouldn't really matter, though, as all the UI stuff isn't scaled,
+  // and it's the only thing that uses it
+  myWidth = w;
+
+  if(1)// FIXME myHaveTexRectEXT)
+    myTexCoord[2] = (GLfloat) myWidth;
+  else
+    myTexCoord[2] = (GLfloat) myWidth / myTexWidth;
+
+//cerr << "  AFTER:  w = " << myWidth <<", texcoord[2] = " << myTexCoord[2] << endl;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void FBSurfaceGL::setHeight(uInt32 h)
 {
+//cerr << "  BEFORE: h = " << myHeight <<", texcoord[3] = " << myTexCoord[3] << endl;
+
+  // This method can't be used with 'scaled' surface (aka TIA surfaces)
+  // That shouldn't really matter, though, as all the UI stuff isn't scaled,
+  // and it's the only thing that uses it
+  myHeight = h;
+
+  if(1)// FIXME myHaveTexRectEXT)
+    myTexCoord[3] = (GLfloat) myHeight;
+  else
+    myTexCoord[3] = (GLfloat) myHeight / myTexHeight;
+
+//cerr << "  AFTER:  h = " << myHeight <<", texcoord[3] = " << myTexCoord[3] << endl;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -764,7 +779,7 @@ void FBSurfaceGL::update()
 {
   if(mySurfaceIsDirty)
   {
-cerr << "  FBSurfaceGL::update(): x = " << myXOrig << ", y = " << myYOrig << ", w = " << myWidth << ", h = " << myHeight << endl;
+//cerr << "  FBSurfaceGL::update(): x = " << myXOrig << ", y = " << myYOrig << ", w = " << myWidth << ", h = " << myHeight << endl;
     // Texturemap complete texture to surface so we have free scaling
     // and antialiasing 
     p_glTexSubImage2D(myTexTarget, 0, 0, 0, myTexWidth, myTexHeight,

stella/src/emucore/FrameBuffer.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: FrameBuffer.cxx,v 1.140 2008-11-24 18:02:19 stephena Exp $
+// $Id: FrameBuffer.cxx,v 1.141 2008-12-04 16:53:26 stephena Exp $
 //============================================================================
 
 #include <algorithm>
@@ -128,8 +128,8 @@ cerr << " <== FrameBuffer::initialize: w = " << width << ", h = " << height << e
   myStatsMsg.h = myOSystem->consoleFont().getFontHeight();
   if(!myStatsMsg.surface)
     myStatsMsg.surface = createSurface(myStatsMsg.w, myStatsMsg.h);
-  if(!myMsg.surface)
+  if(!myMsg.surface)    // TODO - change this to the font we'll really use
-    myMsg.surface = createSurface(320, 15);  // TODO - size depends on font used
+    myMsg.surface = createSurface(320, myOSystem->consoleFont().getFontHeight()+10);
 
   // Finally, show some information about the framebuffer,
   // but only on the first initialization
@@ -234,7 +234,7 @@ void FrameBuffer::update()
   if(myMsg.counter > 0)
     drawMessage();
 
-  // Do any post-frame stuff	 
+  // Do any post-frame stuff
   postFrameUpdate();
 
   // The frame doesn't need to be completely redrawn anymore

stella/src/gui/DialogContainer.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: DialogContainer.cxx,v 1.46 2008-06-19 19:15:44 stephena Exp $
+// $Id: DialogContainer.cxx,v 1.47 2008-12-04 16:53:26 stephena Exp $
 //============================================================================
 
 #include "OSystem.hxx"
@@ -92,9 +92,9 @@ void DialogContainer::draw()
   // Draw all the dialogs on the stack when we want a full refresh
   if(myRefreshFlag)
   {
+cerr << "FULL refresh" << endl;
     for(int i = 0; i < myDialogStack.size(); i++)
     {
-      myDialogStack[i]->center();
       myDialogStack[i]->setDirty();
       myDialogStack[i]->drawDialog();
     }
@@ -102,7 +102,6 @@ void DialogContainer::draw()
   }
   else if(!myDialogStack.empty())
   {
-//    myDialogStack.top()->center();
     myDialogStack.top()->drawDialog();
   }
 }