diff options
author | Ben Murdoch <benm@google.com> | 2014-12-04 19:18:56 +0000 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-12-04 19:18:56 +0000 |
commit | 4c7a4d460bf561e482334ea2efdb4b4a56947a4f (patch) | |
tree | 8d94cddf9541f4c0dd05d9fb7a9e5a9d161e6499 | |
parent | 90f9bfb619635e6e6fe3d6b142cce2c85d894356 (diff) | |
parent | 8383c494222860427b065344d9140170e13cd261 (diff) | |
download | angle-4c7a4d460bf561e482334ea2efdb4b4a56947a4f.tar.gz |
Merge from Chromium at DEPS revision 40.0.2214.27
This commit was generated by merge_to_master.py.
Change-Id: Ic16ae77d0bb100ad60b759255c75526a6c73a533
-rw-r--r-- | src/libGLESv2/Framebuffer.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/libGLESv2/Framebuffer.cpp b/src/libGLESv2/Framebuffer.cpp index 9cd9e25c..74fdd68a 100644 --- a/src/libGLESv2/Framebuffer.cpp +++ b/src/libGLESv2/Framebuffer.cpp @@ -644,12 +644,23 @@ DefaultFramebuffer::DefaultFramebuffer(rx::Renderer *renderer, Colorbuffer *colo Renderbuffer *colorRenderbuffer = new Renderbuffer(0, colorbuffer); mColorbuffers[0] = new RenderbufferAttachment(GL_BACK, colorRenderbuffer); - Renderbuffer *depthStencilBuffer = new Renderbuffer(0, depthStencil); + GLenum depthStencilActualFormat = depthStencil->getActualFormat(); + const gl::InternalFormat &depthStencilFormatInfo = GetInternalFormatInfo(depthStencilActualFormat); - // Make a new attachment objects to ensure we do not double-delete - // See angle issue 686 - mDepthbuffer = (depthStencilBuffer->getDepthSize() != 0 ? new RenderbufferAttachment(GL_DEPTH_ATTACHMENT, depthStencilBuffer) : NULL); - mStencilbuffer = (depthStencilBuffer->getStencilSize() != 0 ? new RenderbufferAttachment(GL_STENCIL_ATTACHMENT, depthStencilBuffer) : NULL); + if (depthStencilFormatInfo.depthBits != 0 || depthStencilFormatInfo.stencilBits != 0) + { + Renderbuffer *depthStencilBuffer = new Renderbuffer(0, depthStencil); + + // Make a new attachment objects to ensure we do not double-delete + // See angle issue 686 + mDepthbuffer = (depthStencilFormatInfo.depthBits != 0 ? new RenderbufferAttachment(GL_DEPTH_ATTACHMENT, depthStencilBuffer) : NULL); + mStencilbuffer = (depthStencilFormatInfo.stencilBits != 0 ? new RenderbufferAttachment(GL_STENCIL_ATTACHMENT, depthStencilBuffer) : NULL); + } + else + { + // This method transfers ownership, so delete the unused storage if we don't keep it. + SafeDelete(depthStencil); + } mDrawBufferStates[0] = GL_BACK; mReadBufferState = GL_BACK; |