thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More android buildfixin'

Browse source
This commit is contained in:
Henrik Rydgard 2013-07-06 00:40:01 +02:00
parent 0eadfdcf62
commit 25392cd408
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
GPU/GLES/Framebuffer.cpp
View file

@ -143,9 +143,12 @@ FramebufferManager::FramebufferManager() :
currentRenderVfb_(0),
drawPixelsTex_(0),
drawPixelsTexFormat_(-1),
convBuf(0),
convBuf(0)
#ifndef USING_GLES2
,
pixelBufObj_(0),
currentPBO_(0)
#endif
{
draw2dprogram = glsl_create_source(basic_vs, tex_fs);
@ -194,7 +197,9 @@ FramebufferManager::~FramebufferManager() {
glDeleteTextures(1, &drawPixelsTex_);
glsl_destroy(draw2dprogram);
#ifndef USING_GLES2
delete [] pixelBufObj_;
#endif
delete [] convBuf;
}
@ -860,6 +865,8 @@ void ConvertFromRGBA8888(u8 *dst, u8 *src, u32 stride, u32 height, int format) {
}
}
#ifndef USING_GLES2
void FramebufferManager::PackFramebufferGL_(VirtualFramebuffer *vfb) {
GLubyte *packed = 0;
bool unbind = false;
@ -1002,6 +1009,8 @@ void FramebufferManager::PackFramebufferGL_(VirtualFramebuffer *vfb) {
}
}
#endif
void FramebufferManager::PackFramebufferGLES_(VirtualFramebuffer *vfb) {
if (useBufferedRendering_ && vfb->fbo) {
fbo_bind_for_read(vfb->fbo);