| 1 |
--- chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp.system-zlib 2020-10-29 23:31:51.000000000 +0100 |
| 2 |
+++ chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp 2020-10-31 12:45:44.809814951 +0100 |
| 3 |
@@ -10,7 +10,9 @@ |
| 4 |
|
| 5 |
#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h" |
| 6 |
|
| 7 |
+#ifndef USE_SYSTEM_ZLIB |
| 8 |
#define USE_SYSTEM_ZLIB |
| 9 |
+#endif |
| 10 |
#include "compression_utils_portable.h" |
| 11 |
|
| 12 |
namespace rx |
| 13 |
--- chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py.system-zlib 2020-10-29 23:31:51.000000000 +0100 |
| 14 |
+++ chromium-87.0.4280.40/third_party/angle/src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py 2020-10-31 12:41:12.681773748 +0100 |
| 15 |
@@ -40,7 +40,9 @@ template_shader_library_cpp = u"""// GEN |
| 16 |
|
| 17 |
#include "libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h" |
| 18 |
|
| 19 |
+#ifndef USE_SYSTEM_ZLIB |
| 20 |
#define USE_SYSTEM_ZLIB |
| 21 |
+#endif |
| 22 |
#include "compression_utils_portable.h" |
| 23 |
|
| 24 |
namespace rx |
| 25 |
--- chromium-94.0.4606.20/third_party/angle/src/libANGLE/MemoryProgramCache.cpp.system-zlib 2021-08-25 21:15:34.000000000 +0200 |
| 26 |
+++ chromium-94.0.4606.20/third_party/angle/src/libANGLE/MemoryProgramCache.cpp 2021-09-02 21:10:35.808262303 +0200 |
| 27 |
@@ -8,7 +8,9 @@ |
| 28 |
// layer to warm up the cache from disk. |
| 29 |
|
| 30 |
// Include zlib first, otherwise FAR gets defined elsewhere. |
| 31 |
+#ifndef USE_SYSTEM_ZLIB |
| 32 |
#define USE_SYSTEM_ZLIB |
| 33 |
+#endif |
| 34 |
#include "compression_utils_portable.h" |
| 35 |
|
| 36 |
#include "libANGLE/MemoryProgramCache.h" |
| 37 |
--- patch/third_party/angle/src/libANGLE/capture/FrameCapture.cpp 2022-09-01 22:36:17.914591000 +0200 |
| 38 |
+++ patch/third_party/angle/src/libANGLE/capture/FrameCapture.cpp.use-system-zlib 2022-09-05 12:31:23.912650156 +0200 |
| 39 |
@@ -47,7 +47,9 @@ |
| 40 |
#include "libANGLE/validationEGL.h" |
| 41 |
#include "third_party/ceval/ceval.h" |
| 42 |
|
| 43 |
+#ifndef USE_SYSTEM_ZLIB |
| 44 |
#define USE_SYSTEM_ZLIB |
| 45 |
+#endif |
| 46 |
#include "compression_utils_portable.h" |
| 47 |
|
| 48 |
#if !ANGLE_CAPTURE_ENABLED |
| 49 |
diff -up chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn |
| 50 |
--- chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib 2020-04-13 12:25:09.001172601 -0400 |
| 51 |
+++ chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn 2020-04-13 12:25:23.688921586 -0400 |
| 52 |
@@ -294,7 +294,7 @@ if (enable_perfetto_zlib) { |
| 53 |
public_configs = [ "//buildtools:zlib_config" ] |
| 54 |
public_deps = [ "//buildtools:zlib" ] |
| 55 |
} else { |
| 56 |
- public_configs = [ "//third_party/zlib:zlib_config" ] |
| 57 |
+ public_configs = [ "//third_party/zlib:system_zlib" ] |
| 58 |
public_deps = [ "//third_party/zlib" ] |
| 59 |
} |
| 60 |
} |
| 61 |
diff -up chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle chromium-77.0.3865.75/third_party/zlib/zconf.h |
| 62 |
--- chromium-77.0.3865.75/third_party/zlib/zconf.h.nozmangle 2019-09-12 09:36:37.924086850 +0200 |
| 63 |
+++ chromium-77.0.3865.75/third_party/zlib/zconf.h 2019-09-12 09:53:01.623958551 +0200 |
| 64 |
@@ -9,18 +9,6 @@ |
| 65 |
#define ZCONF_H |
| 66 |
|
| 67 |
/* |
| 68 |
- * This library is also built as a part of AOSP, which does not need to include |
| 69 |
- * chromeconf.h. This config does not want chromeconf.h, so it can set this |
| 70 |
- * macro to opt out. While this works today, there's no guarantee that building |
| 71 |
- * zlib outside of Chromium keeps working in the future. |
| 72 |
- */ |
| 73 |
-#if !defined(CHROMIUM_ZLIB_NO_CHROMECONF) |
| 74 |
-/* This include does prefixing as below, but with an updated set of names. Also |
| 75 |
- * sets up export macros in component builds. */ |
| 76 |
-#include "chromeconf.h" |
| 77 |
-#endif |
| 78 |
- |
| 79 |
-/* |
| 80 |
* If you *really* need a unique prefix for all types and library functions, |
| 81 |
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. |
| 82 |
* Even better than compiling with -DZ_PREFIX would be to use configure to set |
Parent Directory
| 
Revision Log