Title: [117814] trunk/Source/WebCore
- Revision
- 117814
- Author
- z...@google.com
- Date
- 2012-05-21 14:01:04 -0700 (Mon, 21 May 2012)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117813 => 117814)
--- trunk/Source/WebCore/ChangeLog 2012-05-21 20:52:31 UTC (rev 117813)
+++ trunk/Source/WebCore/ChangeLog 2012-05-21 21:01:04 UTC (rev 117814)
@@ -1,3 +1,13 @@
+2012-05-21 Zhenyao Mo <z...@google.com>
+
+ 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.
+
2012-05-21 Ryosuke Niwa <rn...@webkit.org>
isStartOfDocument and isEndOfDocument are poorly named
Modified: trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp (117813 => 117814)
--- trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-21 20:52:31 UTC (rev 117813)
+++ trunk/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp 2012-05-21 21:01:04 UTC (rev 117814)
@@ -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
