780105f906
This is needed in order to be able to specify a custom location of the ANGLE libs, and enables us to perform a LoadLibrary of ANGLE libs by just having the absolute path to QtANGLE.dll as the argument to LoadLibrary(). Previously, we had two ANGLE libraries: libEGL and libGLESv2. libEGL hard linked against libGLESv2. If we wanted to load libEGL from a custom location, we couldn't load libEGL by calling LoadLibrary with the absolute path to libEGL, because libEGL had problems finding libGLESv2. One solution to that could have been to call SetDllDirectory() with the path to the ANGLE libs before calling LoadLibrary("libEGL.dll"). Since the DLL directory would point to both ANGLE libs, this would ensure that the libGLESv2 was also found. Unfortunately, this approach is not thread safe (SetDllDirectory will affect all subsequent LoadLibrary(Ex) from the same process). Therefore, we chose to merge the two libraries into one to circumvent the whole problem. At the same time, this patch also enables loading of two different ANGLE libraries into the same process at once without renaming them: This was not possible before because libEGL hard linked to libGLESv2.dll. When libGLESv2.dll was already loaded, the second instance of libEGL would simply link against the already loaded version of libGLESv2.dll. This behavior is documented in the LoadLibraryEx documentation on MSDN: "If the string specifies a module name without a path and more than one loaded module has the same base name and extension, the function returns a handle to the module that was loaded first." Change-Id: Ic1d886ba802be72ddcf01235bafaedcef662762e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com> |
||
---|---|---|
.. | ||
aix | ||
android | ||
bsd | ||
c89 | ||
integrity | ||
mac | ||
nacl | ||
posix | ||
qnx | ||
uikit | ||
winrt_winphone | ||
android-base-head.conf | ||
android-base-tail.conf | ||
clang-mac.conf | ||
clang.conf | ||
g++-base.conf | ||
g++-macx.conf | ||
g++-unix.conf | ||
g++.conf | ||
gcc-base-mac.conf | ||
gcc-base-unix.conf | ||
gcc-base.conf | ||
ghs-base.conf | ||
ghs-integrity-armv7.conf | ||
ghs-integrity-x86.conf | ||
ios.conf | ||
linux-android.conf | ||
linux.conf | ||
llvm.conf | ||
mac.conf | ||
macx.conf | ||
msvc-base.conf | ||
msvc-desktop.conf | ||
qcc-base-qnx-aarch64le.conf | ||
qcc-base-qnx-armle-v7.conf | ||
qcc-base-qnx-x86-64.conf | ||
qcc-base-qnx-x86.conf | ||
qcc-base-qnx.conf | ||
qcc-base.conf | ||
sanitize.conf | ||
shell-unix.conf | ||
shell-win32.conf | ||
tvos.conf | ||
uikit.conf | ||
unix.conf | ||
watchos.conf | ||
windows-gles.conf |