blob: 1c0196c732fb6b92fe590f47c0d4c1ae1ec77242 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From bad20e3aebf7dc18621ee711defdfbce17f27c79 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 16 Oct 2018 13:43:43 +0300
Subject: [PATCH] Workaround missing eglGetProcAddress
Renesas boards are unable to find address for the eglGetProcAddress
symbol at runtime, instead do it already at link time.
Task-number: QTBUG-71152
Change-Id: Ibc4251c0ab7e878a65d8c6e7b4da3952807cbc91
---
src/core/core_module.pro | 2 ++
src/core/ozone/gl_ozone_egl_qt.cpp | 3 +++
2 files changed, 5 insertions(+)
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 2bfbc65b9..c6b48fe35 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -85,6 +85,8 @@ win32 {
# and doesn't let Chromium get access to libc symbols through dlsym.
CONFIG -= bsymbolic_functions
+qtConfig(egl): CONFIG += egl
+
linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
REPACK_DIR = $$OUT_PWD/$$getConfigDir()
diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
index 2fa86d79b..d23624776 100644
--- a/src/core/ozone/gl_ozone_egl_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
@@ -98,6 +98,9 @@ bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/)
}
#endif
+ if (!get_proc_address)
+ get_proc_address = &eglGetProcAddress;
+
if (!get_proc_address) {
LOG(ERROR) << "eglGetProcAddress not found.";
base::UnloadNativeLibrary(eglgles2Library);
|