Title: [117998] branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp
- Revision
- 117998
- Author
- z...@google.com
- Date
- 2012-05-22 10:38:31 -0700 (Tue, 22 May 2012)
Log Message
Merge 117814 - Restore WebGL's framebuffer binding after DrawingBuffer's prepareBackBuffer()
https://bugs.webkit.org/show_bug.cgi?id=87032
Reviewed by James Robinson.
* platform/graphics/chromium/DrawingBufferChromium.cpp:
(WebCore::DrawingBuffer::prepareBackBuffer): restore the user's framebuffer binding if there is one.
TBR=z...@google.com
Modified Paths
Diff
Modified: branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (117997 => 117998)
--- branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-22 17:37:27 UTC (rev 117997)
+++ branches/chromium/1132/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-22 17:38:31 UTC (rev 117998)
@@ -132,8 +132,10 @@
m_context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, m_colorBuffer, 0);
}
- if (multisample())
+ if (multisample() && !m_framebufferBinding)
bind();
+ else
+ restoreFramebufferBinding();
}
bool DrawingBuffer::requiresCopyFromBackToFrontBuffer() const
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
