summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2014-12-04 17:59:06 +0100
committerAndras Becsi <andras.becsi@theqtcompany.com>2014-12-08 13:30:03 +0100
commit5c3bfe0e4ddea18c0d44b26cc3b950f9dbf9349f (patch)
treeb24a7e7e5c5a6f848c647b2ddedf9fc7889c77f7
parentff47f09a94a0a31edd40500985ff670e8f35cc2c (diff)
Check for EGL_KHR_fence_sync instead of EGL_KHR_reusable_sync
We create an EGL_KHR_fence_sync on the chromium thread but try to verify if the wait function implementation is available by testing for the EGL_KHR_reusable_sync extension in the scene graph thread. Since the latter extension is not supported by most of our devices, we never actually waited for the rendering to finish. Change-Id: Ied829d4035d42899cfb3f86de018bc48e61c0cc0 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
m---------src/3rdparty0
-rw-r--r--src/core/delegated_frame_node.cpp4
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 577cd47e54bb88c81b7a5b5a6d658d8d61b2c74
+Subproject be4ec3fa64a4c6c2b641830a9811ab7847c7dd3
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index 1a393a0c..e12873c8 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/delegated_frame_node.cpp
@@ -218,7 +218,7 @@ static void waitChromiumSync(gfx::TransferableFence *sync)
static PFNEGLCLIENTWAITSYNCKHRPROC eglClientWaitSyncKHR = 0;
if (!resolved) {
- if (gfx::GLSurfaceQt::HasEGLExtension("EGL_KHR_reusable_sync")) {
+ if (gfx::GLSurfaceQt::HasEGLExtension("EGL_KHR_fence_sync")) {
QOpenGLContext *context = QOpenGLContext::currentContext();
eglClientWaitSyncKHR = (PFNEGLCLIENTWAITSYNCKHRPROC)context->getProcAddress("eglClientWaitSyncKHR");
}
@@ -261,7 +261,7 @@ static void deleteChromiumSync(gfx::TransferableFence *sync)
static PFNEGLDESTROYSYNCKHRPROC eglDestroySyncKHR = 0;
if (!resolved) {
- if (gfx::GLSurfaceQt::HasEGLExtension("EGL_KHR_reusable_sync")) {
+ if (gfx::GLSurfaceQt::HasEGLExtension("EGL_KHR_fence_sync")) {
QOpenGLContext *context = QOpenGLContext::currentContext();
eglDestroySyncKHR = (PFNEGLDESTROYSYNCKHRPROC)context->getProcAddress("eglDestroySyncKHR");
}