Changeset 152222 in webkit

Timestamp:

Jul 1, 2013 7:29:22 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] Avoid creating a QWindow for offscreen GraphicsContext3D
​https://bugs.webkit.org/show_bug.cgi?id=118244

Reviewed by Noam Rosenthal.

In Qt 5.0 we had to create invisible windows, but in Qt 5.1
we can now create specific offscreen surfaces.

• platform/graphics/qt/GraphicsContext3DQt.cpp:

(WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-01  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Avoid creating a QWindow for offscreen GraphicsContext3D
+        https://bugs.webkit.org/show_bug.cgi?id=118244
+
+        Reviewed by Noam Rosenthal.
+
+        In Qt 5.0 we had to create invisible windows, but in Qt 5.1
+        we can now create specific offscreen surfaces.
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3DPrivate::GraphicsContext3DPrivate):
+
 2013-07-01  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

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

@@ -36 +36 @@
 #include "SharedBuffer.h"
 #include "TextureMapperPlatformLayer.h"
-#include <QWindow>
 #include <qpa/qplatformpixmap.h>
 #include <wtf/text/CString.h>
+
+#if QT_VERSION >= 0x050100
+#include <QOffscreenSurface>
+#else
+#include <QWindow>
+#endif
 
 #if USE(TEXTURE_MAPPER_GL)
@@ -117 +122 @@
 
 #if USE(GRAPHICS_SURFACE)
-    // FIXME: Find a way to create a QOpenGLContext without creating a QWindow at all.
-    // We need to create a surface in order to create a QOpenGLContext and make it current.
+#if QT_VERSION >= 0x050100
+    QOffscreenSurface* surface = new QOffscreenSurface;
+    surface->create();
+    m_surface = surface;
+    m_surfaceOwner = surface;
+#else
     QWindow* window = new QWindow;
     window->setSurfaceType(QSurface::OpenGLSurface);
@@ -125 +134 @@
     m_surface = window;
     m_surfaceOwner = window;
-
-    m_platformContext = new QOpenGLContext(window);
+#endif
+
+    m_platformContext = new QOpenGLContext(m_surfaceOwner);
     if (!m_platformContext->create())
         return;