diff options
| author | Jeff Gilbert <jgilbert@mozilla.com> | 2021-07-16 18:05:36 -0700 |
|---|---|---|
| committer | Angle LUCI CQ <angle-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2021-07-19 13:44:31 +0000 |
| commit | 75c0d67c87fcf1a4618a33bc8c8e86aff2490c09 (patch) | |
| tree | 9cadd4fc8c9305ff61084f9303df6231adec27ae | |
| parent | a7056fe674b69c7892897f90437ef253fe12773f (diff) | |
| download | angle-75c0d67c87fcf1a4618a33bc8c8e86aff2490c09.tar.gz | |
Build fixes needed by Firefox circa 2021-feb.
Bug: angleproject:6187
Change-Id: Ife2c9f08ca213358b8fb06a858664d235a860730
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3036592
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
| -rwxr-xr-x | scripts/export_targets.py | 5 | ||||
| -rw-r--r-- | src/libANGLE/MemoryProgramCache.cpp | 4 | ||||
| -rw-r--r-- | src/libGLESv2.gni | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/scripts/export_targets.py b/scripts/export_targets.py index 48306582f5..96cfd659f2 100755 --- a/scripts/export_targets.py +++ b/scripts/export_targets.py @@ -207,6 +207,7 @@ IGNORED_INCLUDES = { b'libANGLE/renderer/null/DisplayNULL.h', b'libANGLE/renderer/vulkan/android/AHBFunctions.h', b'libANGLE/renderer/vulkan/android/DisplayVkAndroid.h', + b'libANGLE/renderer/vulkan/DisplayVk_api.h', b'libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h', b'libANGLE/renderer/vulkan/ggp/DisplayVkGGP.h', b'libANGLE/renderer/vulkan/mac/DisplayVkMac.h', @@ -340,8 +341,8 @@ for (k,desc) in out.items(): for dep_name in set(desc['deps']): dep = descs[dep_name] if dep['type'] in LIBRARY_TYPES: - dep_libs.add(dep_name[3:]) - desc['deps'] = sortedi(dep_libs) + dep_libs.add(dep_name) + desc['dep_libs'] = sortedi(dep_libs) json.dump(out, sys.stdout, indent=' ') exit(0) diff --git a/src/libANGLE/MemoryProgramCache.cpp b/src/libANGLE/MemoryProgramCache.cpp index 4ca835ada3..76a0ca664a 100644 --- a/src/libANGLE/MemoryProgramCache.cpp +++ b/src/libANGLE/MemoryProgramCache.cpp @@ -7,6 +7,10 @@ // always have to be re-compiled. Can be used in conjunction with the platform // layer to warm up the cache from disk. +// Include zlib first, otherwise FAR gets defined elsewhere. +#define USE_SYSTEM_ZLIB +#include "compression_utils_portable.h" + #include "libANGLE/MemoryProgramCache.h" #include <GLSLANG/ShaderVars.h> diff --git a/src/libGLESv2.gni b/src/libGLESv2.gni index 4efe9512fb..23cab6874d 100644 --- a/src/libGLESv2.gni +++ b/src/libGLESv2.gni @@ -295,6 +295,7 @@ libangle_headers = [ "src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h", "src/libANGLE/renderer/FramebufferImpl.h", "src/libANGLE/renderer/GLImplFactory.h", + "src/libANGLE/renderer/gl/functionsgl_enums.h", "src/libANGLE/renderer/ImageImpl.h", "src/libANGLE/renderer/MemoryObjectImpl.h", "src/libANGLE/renderer/OverlayImpl.h", |