actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop generic concurrent rendering. It makes too many things very

Browse Source 
complicated, and I don't trust it at a high level: it makes too
many unchecked things concurrent, so I think it will make things
brittle.
This commit is contained in:
Glenn Maynard
2006-11-13 21:04:17 +00:00
parent e7d4ff3495
commit 35fb88e5e5
6 changed files with 11 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+8 -78
View File
@@ -34,9 +34,6 @@
* (added to by GroupScreen), the screen group is reset: all prepared screens are
* unloaded and the persistance list is cleared.
*
* (For persistance, concurrently preparing a screen is logically equivalent
* to SetNewScreen, since it's going to be set after it finishes loading.)
*
* Note that not all screens yet support reuse in this way; proper use of BeginScreen
* is required. This will misbehave if a screen pushes another screen that's already
* in use lower on the stack, but that's not useful; it would allow infinite screen
@@ -74,11 +71,9 @@
#include "ScreenDimensions.h"
#include "Foreach.h"
#include "ActorUtil.h"
#include "GameLoop.h"
ScreenManager* SCREENMAN = NULL; // global and accessable from anywhere in our program
static Preference<bool> g_bConcurrentLoading( "ConcurrentLoading", false );
static Preference<bool> g_bDelayedScreenLoad( "DelayedScreenLoad", false );
// Screen registration
@@ -331,8 +326,6 @@ bool ScreenManager::IsStackedScreen( const Screen *pScreen ) const
return false;
}
static bool g_bIsConcurrentlyLoading = false;
/* Pop the top screen off the stack, sending SM_LoseFocus messages and
* returning the message the popped screen wants sent to the new top
* screen. Does not send SM_GainFocus. */
@@ -447,20 +440,10 @@ void ScreenManager::Update( float fDeltaTime )
/* If we're currently inside a background screen load, and m_sDelayedScreen
* is set, then the screen called SetNewScreen before we finished preparing.
* Postpone it until we're finished loading. */
if( !IsConcurrentlyLoading() && m_sDelayedScreen.size() != 0 )
if( m_sDelayedScreen.size() != 0 )
{
LoadDelayedScreen();
}
if( !m_sDelayedConcurrentPrepare.empty() )
{
RunConcurrentlyPrepareScreen();
}
}
bool ScreenManager::IsConcurrentlyLoading() const
{
return g_bIsConcurrentlyLoading;
}
void ScreenManager::Draw()
@@ -596,54 +579,6 @@ void ScreenManager::PersistantScreen( const RString &sScreenName )
g_setPersistantScreens.insert( sScreenName );
}
bool ScreenManager::ConcurrentlyPrepareScreen( const RString &sScreenName, ScreenMessage SM )
{
ASSERT_M( m_sDelayedConcurrentPrepare == "", m_sDelayedConcurrentPrepare );
if( !g_bConcurrentLoading || !DISPLAY->SupportsThreadedRendering() )
return false;
LOG->Trace( "ConcurrentlyPrepareScreen(%s)", sScreenName.c_str() );
ASSERT( !IsConcurrentlyLoading() );
m_sDelayedConcurrentPrepare = sScreenName;
m_OnDonePreparingScreen = SM;
return true;
}
void ScreenManager::RunConcurrentlyPrepareScreen()
{
/* Don't call BackgroundPrepareScreen() from within another background load. */
ASSERT( !IsConcurrentlyLoading() );
RString sScreenName = m_sDelayedConcurrentPrepare;
m_sDelayedConcurrentPrepare = "";
ScreenMessage SM = m_OnDonePreparingScreen;
m_OnDonePreparingScreen = SM_None;
/* If the screen is already prepared, we're all set. */
if( !ScreenIsPrepped(sScreenName) )
{
g_bIsConcurrentlyLoading = true;
GameLoop::StartConcurrentRendering();
if( g_setGroupedScreens.find(sScreenName) == g_setGroupedScreens.end() )
DeletePreparedScreens();
PrepareScreen( sScreenName );
GameLoop::FinishConcurrentRendering();
g_bIsConcurrentlyLoading = false;
LOG->Trace( "Concurrent prepare of %s finished", sScreenName.c_str() );
}
/* We're done. Send the message. The screen is allowed to start
* another concurrent prepare from this message. */
SendMessageToTopScreen( SM );
}
void ScreenManager::SetNewScreen( const RString &sScreenName )
{
ASSERT( sScreenName != "" );
@@ -866,17 +801,14 @@ void ScreenManager::RefreshCreditsMessages()
void ScreenManager::ZeroNextUpdate()
{
if( !IsConcurrentlyLoading() )
{
LOG->Trace("ScreenManager::ZeroNextUpdate");
m_bZeroNextUpdate = true;
LOG->Trace("ScreenManager::ZeroNextUpdate");
m_bZeroNextUpdate = true;
/* Loading probably took a little while. Let's reset stats. This prevents us
* from displaying an unnaturally low FPS value, and the next FPS value we
* display will be accurate, which makes skips in the initial tween-ins more
* apparent. */
DISPLAY->ResetStats();
}
/* Loading probably took a little while. Let's reset stats. This prevents us
* from displaying an unnaturally low FPS value, and the next FPS value we
* display will be accurate, which makes skips in the initial tween-ins more
* apparent. */
DISPLAY->ResetStats();
}
void ScreenManager::PlayInvalidSound()
@@ -940,7 +872,6 @@ public:
return 1;
}
static int SystemMessage( T* p, lua_State *L ) { p->SystemMessage( SArg(1) ); return 0; }
static int ConcurrentlyPrepareScreen( T* p, lua_State *L ) { p->ConcurrentlyPrepareScreen( SArg(1) ); return 0; }
static int ScreenIsPrepped( T* p, lua_State *L ) { lua_pushboolean( L, ScreenManagerUtil::ScreenIsPrepped( SArg(1) ) ); return 1; }
LunaScreenManager()
@@ -948,7 +879,6 @@ public:
ADD_METHOD( SetNewScreen );
ADD_METHOD( GetTopScreen );
ADD_METHOD( SystemMessage );
ADD_METHOD( ConcurrentlyPrepareScreen );
ADD_METHOD( ScreenIsPrepped );
}
};
stepmania/src/ScreenManager.h
-3
View File
@@ -30,8 +30,6 @@ public:
void PrepareScreen( const RString &sScreenName ); // creates and caches screen so that the next call to SetNewScreen for the prep'd screen will be very quick.
void GroupScreen( const RString &sScreenName );
void PersistantScreen( const RString &sScreenName );
bool ConcurrentlyPrepareScreen( const RString &sScreenName, ScreenMessage send_when_done = SM_None );
bool IsConcurrentlyLoading() const;
void PopTopScreen( ScreenMessage SM );
void PopAllScreens();
Screen *GetTopScreen();
@@ -81,7 +79,6 @@ private:
void LoadDelayedScreen();
bool ActivatePreparedScreenAndBackground( const RString &sScreenName );
ScreenMessage PopTopScreenInternal( bool bSendLoseFocus = true );
void RunConcurrentlyPrepareScreen();
// Keep these sounds always loaded, because they could be
// played at any time. We want to eliminate SOUND->PlayOnce
stepmania/src/ScreenSelect.cpp
-2
View File
@@ -237,8 +237,6 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
if( !IsTransitioning() )
StartTransitioningScreen( SM_GoToNextScreen );
SCREENMAN->ConcurrentlyPrepareScreen( GetNextScreen() );
}
else if( SM == SM_GoToNextScreen )
{
stepmania/src/ScreenStage.cpp
+3 -11
View File
@@ -65,7 +65,7 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_BeginFadingOut )
{
if( SCREENMAN->IsConcurrentlyLoading() || m_sprOverlay->GetTweenTimeLeft() )
if( m_sprOverlay->GetTweenTimeLeft() )
return;
/* Clear any other SM_BeginFadingOut messages. */
@@ -84,16 +84,8 @@ void ScreenStage::Update( float fDeltaTime )
{
if( this->IsFirstUpdate() )
{
if( SCREENMAN->ConcurrentlyPrepareScreen(GetNextScreen(), SM_BeginFadingOut) )
{
/* Continue when both the screen finishes loading and the tween finishes. */
this->PostScreenMessage( SM_BeginFadingOut, m_sprOverlay->GetTweenTimeLeft() );
}
else
{
/* Prep the new screen once m_In is complete. */
this->PostScreenMessage( SM_PrepScreen, m_sprOverlay->GetTweenTimeLeft() );
}
/* Prep the new screen once m_In is complete. */
this->PostScreenMessage( SM_PrepScreen, m_sprOverlay->GetTweenTimeLeft() );
}
Screen::Update( fDeltaTime );
stepmania/src/ScreenWithMenuElements.cpp
-4
View File
@@ -329,8 +329,6 @@ void ScreenWithMenuElementsSimple::MenuStart( const InputEventPlus &input )
return;
StartTransitioningScreen( SM_GoToNextScreen );
SCREENMAN->ConcurrentlyPrepareScreen( GetNextScreen() );
}
void ScreenWithMenuElementsSimple::MenuBack( const InputEventPlus &input )
@@ -341,8 +339,6 @@ void ScreenWithMenuElementsSimple::MenuBack( const InputEventPlus &input )
return;
Cancel( SM_GoToPrevScreen );
SCREENMAN->ConcurrentlyPrepareScreen( GetNextScreen() );
}
// lua start
stepmania/src/StepMania.cpp
-6
View File
@@ -284,12 +284,6 @@ void ShutdownGame()
static void HandleException( const RString &sError )
{
if( SCREENMAN && SCREENMAN->IsConcurrentlyLoading() )
{
LOG->Trace( "HandleException: FinishConcurrentRendering" );
GameLoop::FinishConcurrentRendering();
}
if( g_bAutoRestart )
HOOKS->RestartProgram();