From ec06b6532af3f49b7d311f87f85bc9f3c5508442 Mon Sep 17 00:00:00 2001 From: raven02 Date: Thu, 8 May 2014 20:30:40 +0800 Subject: [PATCH] Comment out the remaining one LogReadPixelsError() --- GPU/GLES/Framebuffer.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index de218d395e..4bb68e296a 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -1340,7 +1340,7 @@ void ConvertFromRGBA8888(u8 *dst, const u8 *src, u32 stride, u32 height, GEBuffe // TODO: Make more generic. static void LogReadPixelsError(GLenum error) { switch (error) { - case 0: + case GL_NO_ERROR: break; case GL_INVALID_ENUM: ERROR_LOG(SCEGE, "glReadPixels: GL_INVALID_ENUM"); @@ -1349,17 +1349,19 @@ static void LogReadPixelsError(GLenum error) { ERROR_LOG(SCEGE, "glReadPixels: GL_INVALID_VALUE"); break; case GL_INVALID_OPERATION: - // GL_INVALID_OPERATION will happen sometimes midframe but everything - // seems to work out when actually mapping buffers? - // GL_SAMPLE_BUFFERS, GL_READ_BUFFER, GL_BUFFER_SIZE/MAPPED, - // GL_PIXEL_PACK_BUFFER_BINDING, all have the expected values. ERROR_LOG(SCEGE, "glReadPixels: GL_INVALID_OPERATION"); break; case GL_INVALID_FRAMEBUFFER_OPERATION: ERROR_LOG(SCEGE, "glReadPixels: GL_INVALID_FRAMEBUFFER_OPERATION"); break; - default: - ERROR_LOG(SCEGE, "glReadPixels: UNKNOWN OPENGL ERROR %u", error); + case GL_OUT_OF_MEMORY: + ERROR_LOG(SCEGE, "glReadPixels: GL_OUT_OF_MEMORY"); + break; + case GL_STACK_UNDERFLOW: + ERROR_LOG(SCEGE, "glReadPixels: GL_STACK_UNDERFLOW"); + break; + case GL_STACK_OVERFLOW: + ERROR_LOG(SCEGE, "glReadPixels: GL_STACK_OVERFLOW"); break; } } @@ -1487,7 +1489,7 @@ void FramebufferManager::PackFramebufferAsync_(VirtualFramebuffer *vfb) { glReadPixels(0, 0, vfb->fb_stride, vfb->height, pixelFormat, pixelType, 0); } - LogReadPixelsError(glGetError()); + // LogReadPixelsError(glGetError()); fbo_unbind(); if (gl_extensions.FBO_ARB) {