Merge pull request #1957 from wheremyfoodat/splash

Initial splash screen implementation

Author: nicolasnoble

pcsx-redux.nix

@@ -22,7 +22,6 @@
   elfio,
   tracy,
   md4c,
-  stb,
   uriparser,
   ucl,
   llhttp,
@@ -91,6 +90,12 @@ let
       rev = "b1e342774cbb35467dfdd3634d4f0181a76cbc89";
       hash = "sha256-LYvO+chDVo6D++fuFbxqSRltGW3y82SESmtFj39TdSA=";
     })
+    ({
+      owner = "nothings";
+      repo = "stb";
+      rev = "ae721c50eaf761660b4f90cc590453cdb0c2acd0";
+      hash = "sha256-BIhbhXV7q5vodJ3N14vN9mEVwqrP6z9zqEEQrfLPzvI=";
+    })
   ] ++ lib.optional stdenv.hostPlatform.isAarch {
     owner = "grumpycoders";
     repo = "vixl";
@@ -127,7 +132,6 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    stb
     ucl
     md4c
     luajitPackages.libluv

src/gui/gui.cc

@@ -553,6 +553,8 @@ void PCSX::GUI::init(std::function<void()> applyArguments) {
         glfwSetInputMode(m_window, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
     });
     m_listener.listen<Events::ExecutionFlow::Run>([this](const auto& event) {
+        m_enableSplashScreen = false;
+
         glfwSwapInterval(0);
         setRawMouseMotion();
     });
@@ -951,16 +953,19 @@ void PCSX::GUI::startFrame() {
         glBindTexture(GL_TEXTURE_2D, m_offscreenTextures[1]);
         glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_renderSize.x, m_renderSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
 
-        if (m_clearTextures) {
-            const auto allocSize = static_cast<size_t>(std::ceil(m_renderSize.x * m_renderSize.y * sizeof(uint32_t)));
-            GLubyte* data = new GLubyte[allocSize]();
+        if (m_clearTextures || m_enableSplashScreen) {
+            m_clearTextures = false;
+            std::unique_ptr<uint32_t[]> splashImageData = getSplashScreen(m_renderSize.x, m_renderSize.y);
+
+            // Upload to both textures
             for (int i = 0; i < 2; i++) {
                 glBindTexture(GL_TEXTURE_2D, m_offscreenTextures[i]);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
                 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, m_renderSize.x, m_renderSize.y, GL_RGBA, GL_UNSIGNED_BYTE,
-                                data);
+                                splashImageData.get());
             }
-            m_clearTextures = false;
-            delete[] data;
         }
 
         glBindRenderbuffer(GL_RENDERBUFFER, m_offscreenDepthBuffer);
@@ -1067,9 +1072,6 @@ void PCSX::GUI::flip() {
     glBindFramebuffer(GL_FRAMEBUFFER, m_offscreenFrameBuffer);
     glBindTexture(GL_TEXTURE_2D, m_offscreenTextures[m_currentTexture]);
 
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-
     glBindRenderbuffer(GL_RENDERBUFFER, m_offscreenDepthBuffer);
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_offscreenDepthBuffer);
     GLuint texture = m_offscreenTextures[m_currentTexture];
@@ -2890,4 +2892,4 @@ void PCSX::GUI::changeScale(float scale) {
     m_currentScale = scale;
     m_allScales.emplace(scale);
     ImGui::SetCurrentFont(getMainFont());
-}
+}

src/gui/gui.h

@@ -25,6 +25,7 @@
 #include <functional>
 #include <magic_enum_all.hpp>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <string_view>
@@ -454,8 +455,10 @@ class GUI final : public UI {
     bool m_updateAvailable = false;
     bool m_updateDownloading = false;
     bool m_aboutSelectAuthors = false;
+    bool m_enableSplashScreen = true;
 
     void setDefaultShaders();
+    std::unique_ptr<uint32_t[]> getSplashScreen(uint32_t destWidth, uint32_t destHeight);
 
   public:
     bool hasJapanese() { return m_hasJapanese; }