From: ptitSeb Date: Mon, 3 Mar 2014 13:55:01 +0000 (+0100) Subject: GLES2N64: Update from upstream X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=mupen64plus-pandora.git;a=commitdiff_plain;h=ad0f154dfe4248c7dd6b603b10f3a9a422ab1114 GLES2N64: Update from upstream --- diff --git a/source/gles2n64/src/OpenGL.cpp b/source/gles2n64/src/OpenGL.cpp index 6a386f9..3e77821 100755 --- a/source/gles2n64/src/OpenGL.cpp +++ b/source/gles2n64/src/OpenGL.cpp @@ -1169,8 +1169,8 @@ void OGL_ClearDepthBuffer() /////// paulscode, graphics bug-fixes glDisable( GL_SCISSOR_TEST ); glDepthMask( GL_TRUE ); // fixes side-bar graphics glitches -// glClearDepthf( depth ); // broken on Qualcomm Adreno - glClearDepthf( 1.0f ); // fixes missing graphics on Qualcomm Adreno + glClearDepthf( depth ); // broken on Qualcomm Adreno // Should be ok on Pandora +// glClearDepthf( 1.0f ); // fixes missing graphics on Qualcomm Adreno glClearColor( 0, 0, 0, 1 ); glClear( GL_DEPTH_BUFFER_BIT ); OGL_UpdateDepthUpdate(); @@ -1288,15 +1288,15 @@ void OGL_SwapBuffers() if (config.framebuffer.enable) { glBindFramebuffer(GL_FRAMEBUFFER, 0); - glClearColor( 0, 0, 0, 1 ); - glClear( GL_COLOR_BUFFER_BIT ); - glUseProgram(OGL.defaultProgram); glDisable(GL_SCISSOR_TEST); glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE); //*SEB* glViewport(config.window.xpos, config.window.ypos, config.window.width, config.window.height); + glClearColor( 0, 0, 0, 1 ); + glClear( GL_COLOR_BUFFER_BIT ); + static const float vert[] = { -1.0, -1.0, +0.0, +0.0, @@ -1345,8 +1345,8 @@ void OGL_SwapBuffers() float depth = gDP.fillColor.z ; glDisable( GL_SCISSOR_TEST ); glDepthMask( GL_TRUE ); // fixes side-bar graphics glitches -// glClearDepthf( depth ); // broken on Qualcomm Adreno - glClearDepthf( 1.0f ); // fixes missing graphics on Qualcomm Adreno + glClearDepthf( depth ); // broken on Qualcomm Adreno Should by ok on Pandora +// glClearDepthf( 1.0f ); // fixes missing graphics on Qualcomm Adreno glClearColor( 0, 0, 0, 1 ); glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT ); OGL_UpdateDepthUpdate();