summaryrefslogtreecommitdiffstats
path: root/src/core/gl_context_qt.h
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-06-13 18:17:07 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-08-02 10:28:49 +0200
commitddd8ab311271b59514ce0748301e634ca988b62b (patch)
tree7f2cf020558a4eb20b16c000efb77b029f56f076 /src/core/gl_context_qt.h
parent4ffc07ddb8739da9e94a2b23b03c63fd7b74c09a (diff)
Implement GLSurfaceQt and exclude chromium's implementation
This makes it possible to use the same EGLConfig that is used by Qt when initializing the EGL surface instead of relying on eglChooseConfig. We can use the native interface to query the used config from Qt to avoid EGL_BAD_MATCH errors during initialization. This depends on patches in the qtbase dev branch, which will become Qt 5.4 at some point, therefore we can only merge this patch if we make Qt 5.4 a hard-dependency of QtWebEngine. Change-Id: I94319433b0790994ecbf543b74e7d12fa4767e32 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/core/gl_context_qt.h')
-rw-r--r--src/core/gl_context_qt.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/gl_context_qt.h b/src/core/gl_context_qt.h
index 1ad6d2944..0ee6d12dd 100644
--- a/src/core/gl_context_qt.h
+++ b/src/core/gl_context_qt.h
@@ -58,6 +58,12 @@ public:
static void destroy();
static bool initializeContext(gfx::GLContext* context, gfx::GLSurface* surface);
+ static void* getEGLConfig();
+ static void* getXConfig();
+ static void* getEGLDisplay();
+ static void* getXDisplay();
+ static void* getNativeDisplay();
+
private:
Q_INVOKABLE bool initializeContextOnBrowserThread(gfx::GLContext* context, gfx::GLSurface* surface);