From b9011a68f832257ccb474d914951852cc6063f43 Mon Sep 17 00:00:00 2001 From: stephena Date: Wed, 20 Jul 2005 18:44:38 +0000 Subject: [PATCH] OK, this is the absolute last FrameBuffer optimization thing for today (I was supposed to be working on the TIA stuff and I haven't even touched it yet). I think we have to accept that software mode in Windows just isn't as fast as Linux (yay!), and suggest not to use high resolutions in software mode. Normal resolutions of 800x600 or below are fine; it's just 1024x768 and above that causes problems. The good news is that OpenGL mode in Windows works better than it ever did. Hopefully this will take care of that other weird OpenGL problem that I could never track down ... git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@685 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/emucore/FrameBuffer.cxx | 12 +++++++++-- stella/src/win32/Stella/Stella.vcproj | 30 +++++++++++++++++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/stella/src/emucore/FrameBuffer.cxx b/stella/src/emucore/FrameBuffer.cxx index ff9e49f27..3c17829ab 100644 --- a/stella/src/emucore/FrameBuffer.cxx +++ b/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.56 2005-07-20 17:33:03 stephena Exp $ +// $Id: FrameBuffer.cxx,v 1.57 2005-07-20 18:44:38 stephena Exp $ //============================================================================ #include @@ -184,7 +184,8 @@ void FrameBuffer::update() { myMessageTime = -1; theRedrawTIAIndicator = true; - } + drawMediaSource(); // show the changes right now, not next frame + } } } break; // S_EMULATE @@ -260,6 +261,13 @@ void FrameBuffer::refreshOverlay(bool now) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FrameBuffer::showMessage(const string& message) { + // Erase old messages on the screen + if(myMessageTime != -1) + { + theRedrawTIAIndicator = true; + drawMediaSource(); + } + myMessageText = message; myMessageTime = myFrameRate << 1; // Show message for 2 seconds } diff --git a/stella/src/win32/Stella/Stella.vcproj b/stella/src/win32/Stella/Stella.vcproj index 59105688a..53e60d2c8 100644 --- a/stella/src/win32/Stella/Stella.vcproj +++ b/stella/src/win32/Stella/Stella.vcproj @@ -155,6 +155,9 @@ opengl32.lib" + + @@ -236,6 +239,9 @@ opengl32.lib" + + @@ -335,9 +341,6 @@ opengl32.lib" - - @@ -494,6 +497,12 @@ opengl32.lib" + + + + @@ -562,6 +571,9 @@ opengl32.lib" + + @@ -649,6 +661,9 @@ opengl32.lib" + + @@ -757,9 +772,6 @@ opengl32.lib" - - @@ -928,6 +940,12 @@ opengl32.lib" + + + +