notaz.gp2x.de
/
mupen64plus-pandora.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b873e87
)
GLES2N64: Update from upstream
author
ptitSeb
<sebastien.chev@gmail.com>
Mon, 3 Mar 2014 13:55:01 +0000
(14:55 +0100)
committer
ptitSeb
<sebastien.chev@gmail.com>
Mon, 3 Mar 2014 13:55:01 +0000
(14:55 +0100)
source/gles2n64/src/OpenGL.cpp
patch
|
blob
|
blame
|
history
diff --git
a/source/gles2n64/src/OpenGL.cpp
b/source/gles2n64/src/OpenGL.cpp
index
6a386f9
..
3e77821
100755
(executable)
--- 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
/////// 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();
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);
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);
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,
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
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();
glClearColor( 0, 0, 0, 1 );
glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
OGL_UpdateDepthUpdate();