Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 07:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Found a better method to limit buffer swaps during splash screen rendering.

Browse source
This commit is contained in:
Leon Styhre 2023-01-22 23:24:08 +01:00
parent 8c03c97e57
commit 022446bce7
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
es-app/src/SystemData.cpp
View file

@ -25,6 +25,8 @@
#include "views/GamelistView.h" #include "views/GamelistView.h"
#include "views/ViewController.h" #include "views/ViewController.h"
#include <SDL2/SDL_timer.h>
#include <fstream> #include <fstream>
#include <pugixml.hpp> #include <pugixml.hpp>
#include <random> #include <random>
@ -511,6 +513,7 @@ bool SystemData::loadConfig()
const bool splashScreen {Settings::getInstance()->getBool("SplashScreen")}; const bool splashScreen {Settings::getInstance()->getBool("SplashScreen")};
float systemCount {0.0f}; float systemCount {0.0f};
float loadedSystems {0.0f}; float loadedSystems {0.0f};
long unsigned int lastTime {0};
for (pugi::xml_node system {systemList.child("system")}; system; for (pugi::xml_node system {systemList.child("system")}; system;
system = system.next_sibling("system")) { system = system.next_sibling("system")) {
@ -531,11 +534,18 @@ bool SystemData::loadConfig()
path = system.child("path").text().get(); path = system.child("path").text().get();
if (splashScreen) { if (splashScreen) {
const long unsigned int curTime {SDL_GetTicks64()};
const long unsigned int deltaTime {curTime - lastTime};
lastTime = curTime;
++loadedSystems; ++loadedSystems;
// This prevents Renderer::swapBuffers() from being called excessively which
// could lead to significantly longer application startup times.
if (deltaTime > 15) {
const float progress {glm::mix(0.0f, 0.5f, loadedSystems / systemCount)}; const float progress {glm::mix(0.0f, 0.5f, loadedSystems / systemCount)};
Window::getInstance()->renderSplashScreen(Window::SplashScreenState::SCANNING, Window::getInstance()->renderSplashScreen(Window::SplashScreenState::SCANNING,
progress); progress);
} }
}
auto nameFindFunc = [&] { auto nameFindFunc = [&] {
for (auto system : sSystemVector) { for (auto system : sSystemVector) {

8
es-app/src/main.cpp
View file

@ -707,15 +707,7 @@ int main(int argc, char* argv[])
AudioManager::getInstance(); AudioManager::getInstance();
MameNames::getInstance(); MameNames::getInstance();
ThemeData::populateThemeSets(); ThemeData::populateThemeSets();
// We need to temporarily disable VSync as the splash screen may otherwise slow down
// application startup significantly due to excessive swapBuffers() calls.
const bool splashScreen {Settings::getInstance()->getBool("SplashScreen")};
const bool vSync {Settings::getInstance()->getBool("VSync")};
if (splashScreen && vSync)
SDL_GL_SetSwapInterval(0);
loadSystemsReturnCode loadSystemsStatus {loadSystemConfigFile()}; loadSystemsReturnCode loadSystemsStatus {loadSystemConfigFile()};
if (splashScreen && vSync)
SDL_GL_SetSwapInterval(1);
if (loadSystemsStatus) { if (loadSystemsStatus) {
// If there was an issue parsing the es_systems.xml file, display an error message. // If there was an issue parsing the es_systems.xml file, display an error message.

3
es-app/src/views/ViewController.cpp
View file

@ -1104,6 +1104,9 @@ void ViewController::preload()
{ {
unsigned int systemCount {static_cast<unsigned int>(SystemData::sSystemVector.size())}; unsigned int systemCount {static_cast<unsigned int>(SystemData::sSystemVector.size())};
if (Settings::getInstance()->getBool("SplashScreen"))
mWindow->renderSplashScreen(Window::SplashScreenState::POPULATING, 0.5f);
// This reduces the amount of texture pop-in when loading theme extras. // This reduces the amount of texture pop-in when loading theme extras.
if (!SystemData::sSystemVector.empty()) if (!SystemData::sSystemVector.empty())
getSystemListView(); getSystemListView();