Merge pull request #730 from wheremyfoodat/gl-cleanup

wheremyfoodat · web-flow · commit 1ab8625e8066 · 2022-02-12T12:23:30.000+02:00
Clean up some OpenGL code
diff --git a/src/core/psxemulator.cc b/src/core/psxemulator.cc
@@ -117,12 +117,6 @@ void PCSX::Emulator::vsync() {
     g_system->update(true);
     m_cheats->ApplyCheats();
 
-    if (m_vblank_count_hideafter) {
-        if (!(--m_vblank_count_hideafter)) {
-            PCSX::g_emulator->m_gpu->showScreenPic(NULL);
-        }
-    }
-
     if (m_config.RewindInterval > 0 && !(++m_rewind_counter % m_config.RewindInterval)) {
         // CreateRewindState();
     }
diff --git a/src/core/psxemulator.h b/src/core/psxemulator.h
@@ -211,7 +211,6 @@ class Emulator {
 
     // It is safe if these overflow
     uint32_t m_rewind_counter = 0;
-    uint8_t m_vblank_count_hideafter = 0;
 
     // Used for overclocking
     // Make the timing events trigger faster as we are currently assuming everything
diff --git a/src/gpu/soft/draw.cc b/src/gpu/soft/draw.cc
@@ -192,11 +192,13 @@ void ShowGunCursor(unsigned char *surf) {
 static GLuint vramTexture = 0;
 
 void DoBufferSwap() {
+    GLuint textureID = m_gui->getVRAMTexture();
     m_gui->setViewport();
-    m_gui->bindVRAMTexture();
+    glBindTexture(GL_TEXTURE_2D, textureID);
     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 1024, 512, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, psxVuw);
 
     if (PSXDisplay.RGB24) {
+        textureID = vramTexture;
         glBindTexture(GL_TEXTURE_2D, vramTexture);
         glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 682, 512, GL_RGB, GL_UNSIGNED_BYTE, psxVuw);
     }
@@ -213,13 +215,8 @@ void DoBufferSwap() {
     float width = (PSXDisplay.DisplayEnd.x - PSXDisplay.DisplayPosition.x) / 1024.0f;
     float height = (PSXDisplay.DisplayEnd.y - PSXDisplay.DisplayPosition.y) / 512.0f;
 
-    GLint textureID;
-
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &textureID);
     m_gui->m_offscreenShaderEditor.render(m_gui, textureID, {1024.0f, 512.0f}, {startX, startY}, {width, height},
                                           m_gui->getRenderSize());
-
-    glBindTexture(GL_TEXTURE_2D, 0);
     m_gui->flip();
 }
 
diff --git a/src/gui/gui.cc b/src/gui/gui.cc
@@ -271,6 +271,7 @@ end)(jit.status()))
 
     s_this = this;
     glfwSetDropCallback(m_window, drop_callback);
+    glfwSetWindowSizeCallback(m_window, [](GLFWwindow*, int, int) { s_this->m_setupScreenSize = true; });
 
     Resources::loadIcon([this](const uint8_t* data, uint32_t size) {
         int x, y, comp;
@@ -467,6 +468,8 @@ end)(jit.status()))
     m_biosEditor.title = []() { return _("BIOS"); };
     m_biosEditor.show = false;
 
+    m_offscreenShaderEditor.init();
+    m_outputShaderEditor.init();
     m_offscreenShaderEditor.compile(this);
     m_outputShaderEditor.compile(this);
 
@@ -510,7 +513,7 @@ end)(jit.status()))
     });
 
     startFrame();
-    m_currentTexture = 1;
+    m_currentTexture ^= 1;
     flip();
 }
 
@@ -549,6 +552,29 @@ void PCSX::GUI::startFrame() {
     if (glfwWindowShouldClose(m_window)) g_system->quit();
     glfwPollEvents();
 
+    if (m_setupScreenSize) {
+        constexpr float renderRatio = 3.0f / 4.0f;
+        int w, h;
+
+        glfwGetFramebufferSize(m_window, &w, &h);
+        // Make width/height be 1 at minimum
+        w = std::max<int>(w, 1);
+        h = std::max<int>(h, 1);
+        m_framebufferSize = ImVec2(w, h);
+        m_renderSize = ImVec2(w, h);
+        normalizeDimensions(m_renderSize, renderRatio);
+
+        // Reset texture and framebuffer storage
+        glBindTexture(GL_TEXTURE_2D, m_offscreenTextures[0]);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_renderSize.x, m_renderSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
+        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);
+
+        glBindRenderbuffer(GL_RENDERBUFFER, m_offscreenDepthBuffer);
+        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, m_renderSize.x, m_renderSize.y);
+        m_setupScreenSize = false;
+    }
+
     auto& io = ImGui::GetIO();
 
     if (m_reloadFonts) {
@@ -623,12 +649,10 @@ void PCSX::GUI::flip() {
     glBindFramebuffer(GL_FRAMEBUFFER, m_offscreenFrameBuffer);
     glBindTexture(GL_TEXTURE_2D, m_offscreenTextures[m_currentTexture]);
 
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_renderSize.x, m_renderSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
     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);
-    glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, m_renderSize.x, m_renderSize.y);
     glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, m_offscreenDepthBuffer);
     GLuint texture = m_offscreenTextures[m_currentTexture];
     glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture, 0);
@@ -639,8 +663,6 @@ void PCSX::GUI::flip() {
 
     assert(glCheckFramebufferStatus(GL_FRAMEBUFFER) == GL_FRAMEBUFFER_COMPLETE);
 
-    glViewport(0, 0, m_renderSize.x, m_renderSize.y);
-
     glClearColor(0, 0, 0, 0);
     glClearDepthf(0.f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -650,17 +672,16 @@ void PCSX::GUI::flip() {
 }
 
 void PCSX::GUI::endFrame() {
+    constexpr float renderRatio = 3.0f / 4.0f;
+    const int w = m_framebufferSize.x;
+    const int h = m_framebufferSize.y;
+
     auto& io = ImGui::GetIO();
     // bind back the output frame buffer
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
     auto& emuSettings = PCSX::g_emulator->settings;
     auto& debugSettings = emuSettings.get<Emulator::SettingDebugSettings>();
 
-    int w, h;
-    glfwGetFramebufferSize(m_window, &w, &h);
-    m_renderSize = ImVec2(w, h);
-    normalizeDimensions(m_renderSize, m_renderRatio);
-
     bool changed = false;
 
     m_offscreenShaderEditor.configure(this);
@@ -692,7 +713,7 @@ void PCSX::GUI::endFrame() {
                 _("Output"), &outputShown,
                 ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_NoCollapse)) {
             ImVec2 textureSize = ImGui::GetContentRegionAvail();
-            normalizeDimensions(textureSize, m_renderRatio);
+            normalizeDimensions(textureSize, renderRatio);
             ImTextureID texture = reinterpret_cast<ImTextureID*>(m_offscreenTextures[m_currentTexture]);
             m_outputShaderEditor.renderWithImgui(this, texture, m_renderSize, textureSize);
         }
diff --git a/src/gui/gui.h b/src/gui/gui.h
@@ -99,6 +99,7 @@ class GUI final {
     void update(bool vsync = false);
     void flip();
     void bindVRAMTexture();
+    GLuint getVRAMTexture() { return m_VRAMTexture; }
     void setViewport();
     void setFullscreen(bool);
     bool addLog(LogClass logClass, const std::string &msg) {
@@ -189,17 +190,17 @@ class GUI final {
     int &m_glfwPosY = settings.get<WindowPosY>().value;
     int &m_glfwSizeX = settings.get<WindowSizeX>().value;
     int &m_glfwSizeY = settings.get<WindowSizeY>().value;
-    unsigned int m_VRAMTexture = 0;
+    GLuint m_VRAMTexture = 0;
 
     unsigned int m_offscreenFrameBuffer = 0;
     unsigned int m_offscreenTextures[2] = {0, 0};
     unsigned int m_offscreenDepthBuffer = 0;
-    int m_currentTexture = -1;
+    int m_currentTexture = 0;
 
     ImVec4 m_backgroundColor = ImColor(114, 144, 154);
+    ImVec2 m_framebufferSize = ImVec2(1, 1); // Size of GLFW window framebuffer
     ImVec2 m_renderSize = ImVec2(1, 1);
 
-    float m_renderRatio = 3.0f / 4.0f;
     bool &m_fullscreen = {settings.get<Fullscreen>().value};
 
     // GUI
@@ -310,6 +311,7 @@ class GUI final {
     Widgets::ShaderEditor m_outputShaderEditor = {"output"};
 
   public:
+    bool m_setupScreenSize = true;
     Widgets::ShaderEditor m_offscreenShaderEditor = {"offscreen"};
     ImFont *getMono() { return m_monoFont ? m_monoFont : ImGui::GetIO().Fonts[0].Fonts[0]; }
 
diff --git a/src/gui/widgets/shader-editor.cc b/src/gui/widgets/shader-editor.cc
@@ -162,6 +162,11 @@ void PCSX::Widgets::ShaderEditor::setDefaults() {
     m_luaEditor.setText(c_defaultLuaInvoker);
 }
 
+void PCSX::Widgets::ShaderEditor::init() {
+    glGenVertexArrays(1, &m_vao);
+    glGenBuffers(1, &m_vbo);
+}
+
 std::optional<GLuint> PCSX::Widgets::ShaderEditor::compile(GUI *gui,
                                                            const std::vector<std::string_view> &mandatoryAttributes) {
     GLint status = 0;
@@ -698,13 +703,7 @@ void PCSX::Widgets::ShaderEditor::render(GUI *gui, GLuint textureID, const ImVec
         return;
     }
 
-    if (m_vao == 0) {
-        glGenVertexArrays(1, &m_vao);
-        glGenBuffers(1, &m_vbo);
-    }
-
     glBindVertexArray(m_vao);
-
     glUseProgram(m_shaderProgram);
     struct VertexData {
         float positions[3];
@@ -874,8 +873,4 @@ void PCSX::Widgets::ShaderEditor::render(GUI *gui, GLuint textureID, const ImVec
     }
 
     glDrawArrays(GL_TRIANGLES, 0, 6);
-
-    glUseProgram(0);
-    glBindVertexArray(0);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
diff --git a/src/gui/widgets/shader-editor.h b/src/gui/widgets/shader-editor.h
@@ -52,6 +52,7 @@ class ShaderEditor {
     }
 
     void setDefaults();
+    void init();
     void reset(GUI*);
 
     bool draw(GUI*, const char* title);

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ class ShaderEditor {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`void setDefaults();`
	`55`	`+ void init();`
`55`	`56`	`void reset(GUI*);`
`56`	`57`
`57`	`58`	`bool draw(GUI, const char title);`