| commit | e28922c5e71eb32594c2562076cd5b15383e24d4 | [log] [tgz] |
|---|---|---|
| author | Jason Simmons <jsimmons@google.com> | Tue Sep 30 22:46:53 2025 +0000 |
| committer | Jason Simmons <jsimmons@google.com> | Tue Sep 30 22:49:51 2025 +0000 |
| tree | 05dd42abbb7c708518b99fb76e97e3541cff30b1 | |
| parent | 6a09e41ce6ea8c93524faae1a925eb01562f53b1 [diff] |
Cherry pick a fix needed to make this version of ANGLE compatible with current commits of vulkan-deps See https://chromium.googlesource.com/angle/angle/+/83f3bdfd29140454c341c7fc9150acb6f082f828 Change-Id: I69609cf41cb8ba384db3e531d208d40c9c32ed0a
diff --git a/src/third_party/volk/volk.h b/src/third_party/volk/volk.h index 08721b5..16135ec 100644 --- a/src/third_party/volk/volk.h +++ b/src/third_party/volk/volk.h
@@ -48,6 +48,15 @@ # endif # else # include <vulkan/vulkan.h> + /* vulkan.h includes <X11/Xlib.h> when VK_USE_PLATFORM_XLIB_KHR is defined + * after https://github.com/KhronosGroup/Vulkan-Headers/pull/534. + * This defines some macros which break build, so undefine them here. + */ +# undef Always +# undef Bool +# undef None +# undef Status +# undef Success # endif #endif