From adb616477f33d59c825d6b875bf4d8d975c009d9 Mon Sep 17 00:00:00 2001
From: Michal Klocek <Michal.Klocek@qt.io>
Date: Tue, 7 Jul 2020 14:44:42 +0200
Subject: Fix not working egl sync in compositor resource fence

It seems this does not work already for a while.
Add missing headers.

Change-Id: I158519f69e2ce87fe6c84c03a6ac2ce178c20206
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/core/compositor/compositor_resource_fence.cpp | 9 ++++++++-
 src/core/compositor/delegated_frame_node.cpp      | 5 -----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/core/compositor/compositor_resource_fence.cpp b/src/core/compositor/compositor_resource_fence.cpp
index 4179395d6..e7bf2fea7 100644
--- a/src/core/compositor/compositor_resource_fence.cpp
+++ b/src/core/compositor/compositor_resource_fence.cpp
@@ -38,15 +38,22 @@
 ****************************************************************************/
 
 #include "compositor_resource_fence.h"
-
+#include "ozone/gl_surface_qt.h"
 #include "ui/gl/gl_context.h"
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/qopenglcontext.h>
 
 #ifndef GL_TIMEOUT_IGNORED
 #define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
 #endif
 
+
+#if QT_CONFIG(egl)
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#endif
+
 namespace QtWebEngineCore {
 
 void CompositorResourceFence::wait()
diff --git a/src/core/compositor/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp
index 06ca49f4f..f182a2c9e 100644
--- a/src/core/compositor/delegated_frame_node.cpp
+++ b/src/core/compositor/delegated_frame_node.cpp
@@ -79,11 +79,6 @@
 #include <QSGImageNode>
 #include <QSGRectangleNode>
 
-#if QT_CONFIG(egl)
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-#endif
-
 #ifndef GL_TEXTURE_RECTANGLE
 #define GL_TEXTURE_RECTANGLE              0x84F5
 #endif
-- 
cgit v1.2.3