diff --git a/Source/SysVita/Graphics/GraphicsContextVita.cpp b/Source/SysVita/Graphics/GraphicsContextVita.cpp index 534013a6..541ec90e 100644 --- a/Source/SysVita/Graphics/GraphicsContextVita.cpp +++ b/Source/SysVita/Graphics/GraphicsContextVita.cpp @@ -194,6 +194,9 @@ void IGraphicsContext::EndFrame() if (!gPostProcessing) { if (gOverlay) { glBindTexture(GL_TEXTURE_2D, cur_overlay); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, 960, 544, 0, -1, 1); gRenderer->DrawUITexture(); } DrawInGameMenu(); @@ -206,45 +209,41 @@ void IGraphicsContext::EndFrame() void IGraphicsContext::UpdateFrame(bool wait_for_vbl) { vglStopRendering(); - if (gPostProcessing) { - if (emu_fb != 0xDEADBEEF) { - glBindFramebuffer(GL_FRAMEBUFFER, 0); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, 960, 544, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - vglStartRendering(); - glBindTexture(GL_TEXTURE_2D, emu_fb_tex); - glUseProgram(cur_prog); + if (gPostProcessing && emu_fb != 0xDEADBEEF) { + glBindFramebuffer(GL_FRAMEBUFFER, 0); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, 960, 544, 0, -1, 1); + vglStartRendering(); + glBindTexture(GL_TEXTURE_2D, emu_fb_tex); + glUseProgram(cur_prog); - int i = 0; - while (prog_uniforms[i].idx != 0xDEADBEEF) { - switch (prog_uniforms[i].type) { - case UNIF_FLOAT: - glUniform1f(prog_uniforms[i].idx, prog_uniforms[i].value[0]); - break; - case UNIF_COLOR: - glUniform3fv(prog_uniforms[i].idx, 1, prog_uniforms[i].value); - break; - default: - break; - } - i++; + int i = 0; + while (prog_uniforms[i].idx != 0xDEADBEEF) { + switch (prog_uniforms[i].type) { + case UNIF_FLOAT: + glUniform1f(prog_uniforms[i].idx, prog_uniforms[i].value[0]); + break; + case UNIF_COLOR: + glUniform3fv(prog_uniforms[i].idx, 1, prog_uniforms[i].value); + break; + default: + break; } + i++; + } - vglVertexAttribPointerMapped(0, vflux_vertices); - vglVertexAttribPointerMapped(1, vflux_texcoords); - vglDrawObjects(GL_TRIANGLE_FAN, 4, true); - glUseProgram(0); - glEnableClientState(GL_VERTEX_ARRAY); - if (gOverlay) { - glBindTexture(GL_TEXTURE_2D, cur_overlay); - gRenderer->DrawUITexture(); - } - DrawInGameMenu(); - vglStopRendering(); + vglVertexAttribPointerMapped(0, vflux_vertices); + vglVertexAttribPointerMapped(1, vflux_texcoords); + vglDrawObjects(GL_TRIANGLE_FAN, 4, true); + glUseProgram(0); + glEnableClientState(GL_VERTEX_ARRAY); + if (gOverlay) { + glBindTexture(GL_TEXTURE_2D, cur_overlay); + gRenderer->DrawUITexture(); } + DrawInGameMenu(); + vglStopRendering(); } new_frame = true; if (pause_emu) { diff --git a/Source/SysVita/HLEGraphics/RendererLegacy.cpp b/Source/SysVita/HLEGraphics/RendererLegacy.cpp index 5585494a..6eddace4 100644 --- a/Source/SysVita/HLEGraphics/RendererLegacy.cpp +++ b/Source/SysVita/HLEGraphics/RendererLegacy.cpp @@ -842,11 +842,6 @@ void RendererLegacy::DrawUITexture() glDisableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_COLOR_ARRAY); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, 960, 544, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); vglDrawObjects(GL_TRIANGLE_STRIP, 4, GL_TRUE); } diff --git a/Source/SysVita/HLEGraphics/RendererModern.cpp b/Source/SysVita/HLEGraphics/RendererModern.cpp index 7ad6bb13..b80b8fe3 100644 --- a/Source/SysVita/HLEGraphics/RendererModern.cpp +++ b/Source/SysVita/HLEGraphics/RendererModern.cpp @@ -991,11 +991,6 @@ void RendererModern::DrawUITexture() glDisableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); glEnableClientState(GL_COLOR_ARRAY); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, 960, 544, 0, -1, 1); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); vglDrawObjects(GL_TRIANGLE_STRIP, 4, GL_TRUE); }