Auto merge of #35 - jrmuizel:no-loader, r=jdm

Don't use EGL loader This seems to make it so having the DLL around is not required.
servo · Sep 13, 2019 · 706a9ba · 706a9ba
2 parents 1b6c8f6 + f183472
commit 706a9ba
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mozangle"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["The ANGLE Project Authors", "The Servo Project Developers"]
 license = " BSD-3-Clause"
 description = "Mozilla’s fork of Google ANGLE, repackaged as a Rust crate "
@@ -20,4 +20,4 @@ walkdir = "2"
 
 [features]
 egl = ["gl_generator"]  # Only does anything on Windows
-build_dlls = []
+build_dlls = []
diff --git a/build.rs b/build.rs
@@ -78,6 +78,9 @@ fn build_egl(target: &str) {
     for &(k, v) in data.defines {
         build.define(k, v);
     }
+    if cfg!(feature = "build_dlls") {
+        build.define("ANGLE_USE_EGL_LOADER", None);
+    }
 
     for file in data.includes {
         build.include(fixup_path(file));

diff --git a/build_data.rs b/build_data.rs
@@ -874,7 +874,6 @@ pub const EGL: Data = Data {
         ("ANGLE_GENERATE_SHADER_DEBUG_INFO", None),
         ("ANGLE_GLESV2_LIBRARY_NAME", Some("\"libGLESv2\"")),
         ("ANGLE_SKIP_DXGI_1_2_CHECK", None),
-        ("ANGLE_USE_EGL_LOADER", None),
         ("DYNAMIC_ANNOTATIONS_ENABLED", Some("1")),
         ("EGLAPI", Some("")),
         ("EGL_EGLEXT_PROTOTYPES", None),

diff --git a/gfx/angle/targets/libEGL/moz.build b/gfx/angle/targets/libEGL/moz.build
@@ -6,7 +6,7 @@ include('../../moz.build.common')
 DEFINES['ANGLE_ENABLE_DEBUG_ANNOTATIONS'] = True
 DEFINES['ANGLE_GLESV2_LIBRARY_NAME'] = '"libGLESv2"'
 #DEFINES['ANGLE_IS_64_BIT_CPU'] = True
-DEFINES['ANGLE_USE_EGL_LOADER'] = True
+#DEFINES['ANGLE_USE_EGL_LOADER'] = True
 #DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
 #DEFINES['CHROMIUM_BUILD'] = True
 #DEFINES['COMPONENT_BUILD'] = True
@@ -179,4 +179,4 @@ OS_LIBS += [
 
 DEFFILE = '../../checkout/src/libEGL/libEGL.def'
 RCFILE = '../../checkout/src/libEGL/libEGL.rc'
-GeckoSharedLibrary('libEGL', linkage=None)
+GeckoSharedLibrary('libEGL', linkage=None)
diff --git a/gfx/angle/update-angle.py b/gfx/angle/update-angle.py
@@ -353,7 +353,6 @@ def append_arr(dest, name, vals, indent=0):
     'ANGLE_GLESV2_LIBRARY_NAME': True,
     'ANGLE_IS_64_BIT_CPU': False,
     'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES': False,
-    'ANGLE_USE_EGL_LOADER': True,
     'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS': False,
     'CHROMIUM_BUILD': False,
     'COMPONENT_BUILD': False,

diff --git a/patches/egl-loader.patch b/patches/egl-loader.patch
@@ -0,0 +1,32 @@
+diff --git a/gfx/angle/targets/libEGL/moz.build b/gfx/angle/targets/libEGL/moz.build
+index c16b620..99c8adf 100644
+--- a/gfx/angle/targets/libEGL/moz.build
++++ b/gfx/angle/targets/libEGL/moz.build
+@@ -6,7 +6,7 @@ include('../../moz.build.common')
+ DEFINES['ANGLE_ENABLE_DEBUG_ANNOTATIONS'] = True
+ DEFINES['ANGLE_GLESV2_LIBRARY_NAME'] = '"libGLESv2"'
+ #DEFINES['ANGLE_IS_64_BIT_CPU'] = True
+-DEFINES['ANGLE_USE_EGL_LOADER'] = True
++#DEFINES['ANGLE_USE_EGL_LOADER'] = True
+ #DEFINES['CERT_CHAIN_PARA_HAS_EXTRA_FIELDS'] = True
+ #DEFINES['CHROMIUM_BUILD'] = True
+ #DEFINES['COMPONENT_BUILD'] = True
+@@ -179,4 +179,4 @@ OS_LIBS += [
+
+ DEFFILE = '../../checkout/src/libEGL/libEGL.def'
+ RCFILE = '../../checkout/src/libEGL/libEGL.rc'
+-GeckoSharedLibrary('libEGL', linkage=None)
+\ No newline at end of file
++GeckoSharedLibrary('libEGL', linkage=None)
+diff --git a/gfx/angle/update-angle.py b/gfx/angle/update-angle.py
+index a1e677d..1e0df7e 100644
+--- a/gfx/angle/update-angle.py
++++ b/gfx/angle/update-angle.py
+@@ -353,7 +353,6 @@ REGISTERED_DEFINES = {
+     'ANGLE_GLESV2_LIBRARY_NAME': True,
+     'ANGLE_IS_64_BIT_CPU': False,
+     'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES': False,
+-    'ANGLE_USE_EGL_LOADER': True,
+     'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS': False,
+     'CHROMIUM_BUILD': False,
+     'COMPONENT_BUILD': False,