Title: [135998] trunk/Source/WebCore
- Revision
- 135998
- Author
- [email protected]
- Date
- 2012-11-28 04:49:22 -0800 (Wed, 28 Nov 2012)
Log Message
GraphicsSurface: Implement usage of GraphicsSurface for WebGL in WK1.
https://bugs.webkit.org/show_bug.cgi?id=103497
Unreviewed buildfix.
Any usage of GraphicsSurface needs to be wrapped with USE(GRAPHICS_SURFACE).
* platform/graphics/qt/GraphicsContext3DQt.cpp:
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135997 => 135998)
--- trunk/Source/WebCore/ChangeLog 2012-11-28 12:45:45 UTC (rev 135997)
+++ trunk/Source/WebCore/ChangeLog 2012-11-28 12:49:22 UTC (rev 135998)
@@ -3,6 +3,18 @@
GraphicsSurface: Implement usage of GraphicsSurface for WebGL in WK1.
https://bugs.webkit.org/show_bug.cgi?id=103497
+ Unreviewed buildfix.
+
+ Any usage of GraphicsSurface needs to be wrapped with USE(GRAPHICS_SURFACE).
+
+ * platform/graphics/qt/GraphicsContext3DQt.cpp:
+ (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
+
+2012-11-28 Zeno Albisser <[email protected]>
+
+ GraphicsSurface: Implement usage of GraphicsSurface for WebGL in WK1.
+ https://bugs.webkit.org/show_bug.cgi?id=103497
+
This is a temporary workaround for an issue with GraphicsSurfaceMac.
GraphicsSurfaceMac is currently implemented using CGL only.
CGL does not allow us to properly restore the NSView a context was made current with.
Modified: trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (135997 => 135998)
--- trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2012-11-28 12:45:45 UTC (rev 135997)
+++ trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp 2012-11-28 12:49:22 UTC (rev 135998)
@@ -213,7 +213,7 @@
blitMultisampleFramebufferAndRestoreContext();
if (textureMapper->accelerationMode() == TextureMapper::OpenGLMode) {
-
+#if USE(GRAPHICS_SURFACE)
// CGL only provides us the context, but not the view the context is currently bound to.
// To make sure the context is bound the the right surface we have to do a makeCurrent through QOpenGL again.
// FIXME: Remove this code as soon as GraphicsSurfaceMac makes use of NSOpenGL.
@@ -230,6 +230,7 @@
TextureMapperGL* texmapGL = static_cast<TextureMapperGL*>(textureMapper);
m_graphicsSurface->paintToTextureMapper(texmapGL, targetRect, matrix, opacity, mask);
+#endif
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
