Title: [131355] trunk/Source/WebCore
- Revision
- 131355
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-15 14:20:06 -0700 (Mon, 15 Oct 2012)
Log Message
[EFL][WK2][Texmap] Set gl context in GraphicsContext3DPrivate
https://bugs.webkit.org/show_bug.cgi?id=99325
Patch by Yael Aharon <yael.aha...@intel.com> on 2012-10-15
Reviewed by Kenneth Rohde Christiansen.
Based on a patch from Regina Chung.
This piece of code was lost in the final patch of https://bugs.webkit.org/show_bug.cgi?id=96627.
The gl context is used as key in a hash map and cannot be NULL.
No new tests. Accelerated compositing is not yet enabled in the EFL port.
* platform/graphics/efl/GraphicsContext3DEfl.cpp:
(WebCore::GraphicsContext3D::GraphicsContext3D):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131354 => 131355)
--- trunk/Source/WebCore/ChangeLog 2012-10-15 21:00:46 UTC (rev 131354)
+++ trunk/Source/WebCore/ChangeLog 2012-10-15 21:20:06 UTC (rev 131355)
@@ -1,3 +1,19 @@
+2012-10-15 Yael Aharon <yael.aha...@intel.com>
+
+ [EFL][WK2][Texmap] Set gl context in GraphicsContext3DPrivate
+ https://bugs.webkit.org/show_bug.cgi?id=99325
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Based on a patch from Regina Chung.
+ This piece of code was lost in the final patch of https://bugs.webkit.org/show_bug.cgi?id=96627.
+ The gl context is used as key in a hash map and cannot be NULL.
+
+ No new tests. Accelerated compositing is not yet enabled in the EFL port.
+
+ * platform/graphics/efl/GraphicsContext3DEfl.cpp:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
2012-10-15 Mike West <mk...@chromium.org>
Console messages containing long URLs should cut at some reasonable length.
Modified: trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp (131354 => 131355)
--- trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2012-10-15 21:00:46 UTC (rev 131354)
+++ trunk/Source/WebCore/platform/graphics/efl/GraphicsContext3DEfl.cpp 2012-10-15 21:20:06 UTC (rev 131355)
@@ -82,6 +82,14 @@
return;
}
+ if (renderStyle == RenderToCurrentGLContext) {
+ // Evas doesn't allow including gl headers and Evas_GL headers at the same time,
+ // so we need to query the current gl context/surface here instead of in GraphicsContext3DPrivate.
+ void* currentContext = (void*)glXGetCurrentContext();
+ void* currentSurface = (void*)glXGetCurrentDrawable();
+ m_private->setCurrentGLContext(currentContext, currentSurface);
+ }
+
if (renderStyle == RenderOffscreen) {
// Create buffers for the canvas FBO.
glGenFramebuffers(/* count */ 1, &m_fbo);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
