mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-23 09:32:47 +00:00
3d7386b77a
``` DEBUG: In file included from ../../third_party/angle/src/common/vulkan/vulkan_icd.cpp:9: DEBUG: In file included from ../../third_party/angle/src/common/vulkan/vulkan_icd.h:15: DEBUG: In file included from ../../third_party/angle/src/common/vulkan/vk_headers.h:14: DEBUG: In file included from ../../third_party/angle/src/third_party/volk/volk.h:50: DEBUG: In file included from ../../third_party/vulkan-deps/vulkan-headers/src/include/vulkan/vulkan.h:41: DEBUG: In file included from ../../third_party/wayland/src/src/wayland-client.h:40: DEBUG: /usr/include/wayland-client-protocol.h:1038:13: error: use of undeclared identifier 'wl_proxy_marshal_flags' DEBUG: callback = wl_proxy_marshal_flags((struct wl_proxy *) wl_display, ```
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn
|
|
--- a/third_party/angle.orig/BUILD.gn 2022-08-17 19:38:11.000000000 +0000
|
|
+++ b/third_party/angle/BUILD.gn 2022-08-18 11:04:09.061751111 +0000
|
|
@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") {
|
|
if (angle_enable_vulkan && angle_use_wayland &&
|
|
defined(vulkan_wayland_include_dirs)) {
|
|
include_dirs = vulkan_wayland_include_dirs
|
|
+ } else if (angle_enable_vulkan && angle_use_wayland) {
|
|
+ include_dirs = [
|
|
+ "$wayland_gn_dir/src/src",
|
|
+ "$wayland_gn_dir/include/src",
|
|
+ "$wayland_gn_dir/include/protocol",
|
|
+ ]
|
|
}
|
|
}
|
|
|
|
@@ -1073,6 +1079,7 @@ if (angle_use_wayland) {
|
|
include_dirs = [
|
|
"$wayland_dir/egl",
|
|
"$wayland_dir/src",
|
|
+ "$wayland_gn_dir/include/protocol",
|
|
]
|
|
}
|
|
|
|
diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn
|
|
--- a/third_party/angle.orig/src/third_party/volk/BUILD.gn 2022-08-17 19:38:12.000000000 +0000
|
|
+++ b/third_party/angle/src/third_party/volk/BUILD.gn 2022-08-18 11:04:36.499828006 +0000
|
|
@@ -21,6 +21,9 @@ source_set("volk") {
|
|
configs += [ "$angle_root:angle_no_cfi_icall" ]
|
|
public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
|
|
if (angle_use_wayland) {
|
|
- include_dirs = [ "$wayland_dir/src" ]
|
|
+ include_dirs = [
|
|
+ "$wayland_dir/src",
|
|
+ "$wayland_gn_dir/include/protocol",
|
|
+ ]
|
|
}
|
|
}
|