corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1174705 - add GLContext::GetDefaultFramebuffer. r=jgilbert

Browse Source
This commit is contained in:
Ted Mielczarek
2015-05-11 15:10:06 -04:00
parent b2c9bf86af
commit 8bfda7ce46
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/layers/opengl/CompositingRenderTargetOGL.cpp
View File

@@ -37,7 +37,8 @@ CompositingRenderTargetOGL::BindRenderTarget()
InitializeImpl();
} else {
MOZ_ASSERT(mInitParams.mStatus == InitParams::INITIALIZED);
mGL->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, mFBO);
GLuint fbo = mFBO == 0 ? mGL->GetDefaultFramebuffer() : mFBO;
mGL->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, fbo);
GLenum result = mGL->fCheckFramebufferStatus(LOCAL_GL_FRAMEBUFFER);
if (result != LOCAL_GL_FRAMEBUFFER_COMPLETE) {
// The main framebuffer (0) of non-offscreen contexts
@@ -83,7 +84,9 @@ CompositingRenderTargetOGL::InitializeImpl()
{
MOZ_ASSERT(mInitParams.mStatus == InitParams::READY);
mGL->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, mFBO);
//TODO: call mGL->GetBackbufferFB(), use that
GLuint fbo = mFBO == 0 ? mGL->GetDefaultFramebuffer() : mFBO;
mGL->fBindFramebuffer(LOCAL_GL_FRAMEBUFFER, fbo);
mGL->fFramebufferTexture2D(LOCAL_GL_FRAMEBUFFER,
LOCAL_GL_COLOR_ATTACHMENT0,
mInitParams.mFBOTextureTarget,