From edb447292776aa1dd87a93ccc461a03fcc6e6897 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 19 Oct 2013 14:04:46 -0700 Subject: [PATCH] Fix some formatting warnings. --- GPU/GLES/Framebuffer.cpp | 2 +- GPU/GLES/Framebuffer.h | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index f7cbe87bc2..4800ad93dd 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -1063,7 +1063,7 @@ void FramebufferManager::PackFramebufferAsync_(VirtualFramebuffer *vfb) { packed = (GLubyte *)glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY); if (packed) { - DEBUG_LOG(SCEGE, "Reading PBO to memory , bufSize = %u, packed = %08x, fb_address = %08x, stride = %u, pbo = %u", + DEBUG_LOG(SCEGE, "Reading PBO to memory , bufSize = %u, packed = %p, fb_address = %08x, stride = %u, pbo = %u", pixelBufObj_[nextPBO].size, packed, pixelBufObj_[nextPBO].fb_address, pixelBufObj_[nextPBO].stride, nextPBO); if (useCPU) { diff --git a/GPU/GLES/Framebuffer.h b/GPU/GLES/Framebuffer.h index 755d335e6b..70afe6d655 100644 --- a/GPU/GLES/Framebuffer.h +++ b/GPU/GLES/Framebuffer.h @@ -190,14 +190,6 @@ private: void PackFramebufferAsync_(VirtualFramebuffer *vfb); #endif void PackFramebufferSync_(VirtualFramebuffer *vfb); - std::vector bvfbs_; // blitting FBOs - - std::set> knownFramebufferCopies_; - -#ifndef USING_GLES2 - AsyncPBO *pixelBufObj_; //this isn't that large - u8 currentPBO_; -#endif // Used by DrawPixels unsigned int drawPixelsTex_; @@ -216,4 +208,13 @@ private: bool resized_; bool useBufferedRendering_; + + std::vector bvfbs_; // blitting FBOs + + std::set> knownFramebufferCopies_; + +#ifndef USING_GLES2 + AsyncPBO *pixelBufObj_; //this isn't that large + u8 currentPBO_; +#endif };