[GUI] Clean up some GL code.

Author: wheremyfoodat

src/gpu/soft/draw.cc

@@ -193,11 +193,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);
     }
@@ -214,13 +216,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();
 }
 

src/gui/gui.cc

@@ -638,8 +638,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);

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,7 +190,7 @@ 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};

src/gui/widgets/shader-editor.cc

@@ -874,8 +874,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);
 }