blob: e33446e7a733ad299caaca10e1e1c1024244ccd8 (
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 f99110bf64fa81d207771d96abfd850b168794fc 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 520b452f..e3cef8a9 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -41,6 +41,8 @@ QMAKE_INFO_PLIST = Info_mac.plist
# and doesn't let Chromium get access to libc symbols through dlsym.
CONFIG -= bsymbolic_functions
+qtConfig(egl): CONFIG += egl
+
linux {
!ccache:!use_gold_linker:!use_lld_linker {
QMAKE_LINK="ulimit -n 4096 && $$QMAKE_LINK"
diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp
index 04b33699..d57c2be4 100644
--- a/src/core/ozone/gl_ozone_egl_qt.cpp
+++ b/src/core/ozone/gl_ozone_egl_qt.cpp
@@ -87,6 +87,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);
|
