Changeset 152282 in webkit

Timestamp:

Jul 2, 2013 4:04:48 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt][WK1] Support WebGL with EGL on Linux
​https://bugs.webkit.org/show_bug.cgi?id=118251

Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Let GraphicsContext3D work without a GraphicsSurface.

• Target.pri:
• platform/graphics/OpenGLShims.cpp:

(WebCore::getProcAddress):

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
(WebCore::GraphicsContext3DPrivate::paintToTextureMapper):

Tools:

• qmake/mkspecs/features/features.prf:

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Target.pri (modified) (1 diff)
• Source/WebCore/platform/graphics/OpenGLShims.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (4 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/qmake/mkspecs/features/features.prf (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-02  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt][WK1] Support WebGL with EGL on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=118251
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Let GraphicsContext3D work without a GraphicsSurface.
+
+        * Target.pri:
+        * platform/graphics/OpenGLShims.cpp:
+        (WebCore::getProcAddress):
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
+        (WebCore::GraphicsContext3DPrivate::paintToTextureMapper):
+
 2013-07-02  Catalin Badea  <badea@adobe.com>
 

trunk/Source/WebCore/Target.pri

@@ -4250 +4250 @@
         SOURCES += platform/graphics/surfaces/win/GraphicsSurfaceWin.cpp
     }
-    have?(XCOMPOSITE) {
+    use?(glx) {
         HEADERS += \
             platform/graphics/surfaces/glx/X11Helper.h \

trunk/Source/WebCore/platform/graphics/OpenGLShims.cpp

@@ -41 +41 @@
 static void* getProcAddress(const char* procName)
 {
-    return reinterpret_cast<void*>(QOpenGLContext::currentContext()->getProcAddress(procName));
+    if (QOpenGLContext* context = QOpenGLContext::currentContext())
+        return reinterpret_cast<void*>(context->getProcAddress(procName));
+    return 0;
 }
 #else

trunk/Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -121 +121 @@
     }
 
-#if USE(GRAPHICS_SURFACE)
 #if QT_VERSION >= 0x050100
     QOffscreenSurface* surface = new QOffscreenSurface;
@@ -141 +140 @@
 
     makeCurrentIfNeeded();
+
+#if USE(GRAPHICS_SURFACE)
     IntSize surfaceSize(m_context->m_currentWidth, m_context->m_currentHeight);
     m_surfaceFlags = GraphicsSurface::SupportsTextureTarget
@@ -229 +230 @@
     blitMultisampleFramebufferAndRestoreContext();
 
+#if USE(GRAPHICS_SURFACE)
+    ASSERT(m_graphicsSurface);
     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.
@@ -247 +249 @@
         TextureMapperGL* texmapGL = static_cast<TextureMapperGL*>(textureMapper);
         m_graphicsSurface->paintToTextureMapper(texmapGL, targetRect, matrix, opacity);
-#endif
-        return;
-    }
+        return;
+    }
+#endif
 
     GraphicsContext* context = textureMapper->graphicsContext();

trunk/Tools/ChangeLog

@@ +1 @@
+2013-07-02  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt][WK1] Support WebGL with EGL on Linux
+        https://bugs.webkit.org/show_bug.cgi?id=118251
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * qmake/mkspecs/features/features.prf:
+
 2013-07-01  Nick Diego Yamane  <nick.yamane@openbossa.org>
 

trunk/Tools/qmake/mkspecs/features/features.prf

@@ -141 +141 @@
         mac: WEBKIT_CONFIG += use_graphics_surface
         win32:contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_graphics_surface
-        linux-*:contains(WEBKIT_CONFIG, have_glx):contains(WEBKIT_CONFIG, have_xcomposite):contains(WEBKIT_CONFIG, have_xrender): WEBKIT_CONFIG += use_graphics_surface use_glx
+        have?(glx):have?(xcomposite):have?(xrender): WEBKIT_CONFIG += use_graphics_surface use_glx
     }