From 7f49dd39c2e82fceaa53ba2e70698203eeae083f Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Fri, 29 Nov 2013 16:08:15 +0700 Subject: [PATCH] Replace frameBuffer.drawBuffer from GL_DRAW_FRAMEBUFFER to gles compatible GL_FRAMEBUFFER --- FrameBuffer.cpp | 2 +- OpenGL.cpp | 4 ++-- gDP.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FrameBuffer.cpp b/FrameBuffer.cpp index 9c51bf4a..2f35d9c8 100644 --- a/FrameBuffer.cpp +++ b/FrameBuffer.cpp @@ -247,7 +247,7 @@ void FrameBuffer_Destroy() void FrameBuffer_SaveBuffer( u32 address, u16 format, u16 size, u16 width, u16 height ) { - frameBuffer.drawBuffer = GL_DRAW_FRAMEBUFFER; + frameBuffer.drawBuffer = GL_FRAMEBUFFER; FrameBuffer *current = frameBuffer.top; if (current != NULL && gDP.colorImage.height > 1) { current->endAddress = current->startAddress + (((current->width * gDP.colorImage.height) << current->size >> 1) - 1); diff --git a/OpenGL.cpp b/OpenGL.cpp index b123f18f..c728ce6f 100644 --- a/OpenGL.cpp +++ b/OpenGL.cpp @@ -867,7 +867,7 @@ void OGL_DrawRect( int ulx, int uly, int lrx, int lry, float *color ) glDisable( GL_CULL_FACE ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); - if (frameBuffer.drawBuffer != GL_DRAW_FRAMEBUFFER) { + if (frameBuffer.drawBuffer != GL_FRAMEBUFFER) { glOrtho( 0, VI.width, VI.height, 0, 1.0f, -1.0f ); glViewport( 0, (frameBuffer.drawBuffer == GL_BACK ? OGL.heightOffset : 0), OGL.width, OGL.height ); } else { @@ -912,7 +912,7 @@ void OGL_DrawTexturedRect( float ulx, float uly, float lrx, float lry, float uls glDisable( GL_CULL_FACE ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); - if (frameBuffer.drawBuffer != GL_DRAW_FRAMEBUFFER) { + if (frameBuffer.drawBuffer != GL_FRAMEBUFFER) { glOrtho( 0, VI.width, VI.height, 0, 1.0f, -1.0f ); glViewport( 0, (frameBuffer.drawBuffer == GL_BACK ? OGL.heightOffset : 0), OGL.width, OGL.height ); } else { diff --git a/gDP.cpp b/gDP.cpp index 7dce1da4..d42140eb 100644 --- a/gDP.cpp +++ b/gDP.cpp @@ -743,7 +743,7 @@ void gDPFillRDRAM(u32 address, s32 ulx, s32 uly, s32 lrx, s32 lry, u32 width, u3 { if (g_bDepthClearOnly && color != DEPTH_CLEAR_COLOR) return; - if (frameBuffer.drawBuffer == GL_DRAW_FRAMEBUFFER) { + if (frameBuffer.drawBuffer == GL_FRAMEBUFFER) { frameBuffer.top->cleared = true; frameBuffer.top->fillcolor = color; }