godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-06 02:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Make SPIRV optional for Metal backend"

Browse Source 
This reverts commit 29287e1fc7.

Reason for revert:
Possible root cause of Mac failures http://crbug.com/1320588

Original change's description:
> Make SPIRV optional for Metal backend
>
> This allows clients (ie Skia) to build ANGLE without needing
> all of the additional Vulkan dependencies. Developer builds
> will continue to include both the direct and SPIRV paths, for
> debugging purposes.
>
> Bug: angleproject:7155
> Change-Id: I1c38ee19e747df8b25fd2f8e8efa3b420a4d7766
> Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3605764
> Commit-Queue: Kenneth Russell <kbr@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Auto-Submit: Brian Osman <brianosman@google.com>
> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Bug: chromium:1320588
Change-Id: Id160118146dad1b8f1af40c60ddefd717516cd1d
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3614527
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Auto-Submit: Cody Northrop <cnorthrop@google.com>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
This commit is contained in:
Cody Northrop
2022-04-28 09:05:43 -06:00
committed by Angle LUCI CQ
parent f9729598a6
commit 437053a163
4 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gni/angle.gni
View File

@@ -120,10 +120,6 @@ declare_args() {
angle_has_frame_capture = angle_has_rapidjson
}
declare_args() {
angle_enable_msl_through_spirv = is_mac && angle_debug_layers_enabled
}
declare_args() {
# By default, ANGLE is using a thread pool for parallel compilation.
# Activating the delegate worker results in posting the tasks using the
@@ -147,7 +143,7 @@ declare_args() {
((is_win && !angle_is_winuwp) ||
((is_linux || is_chromeos) &&
(angle_use_x11 || angle_use_wayland || angle_use_vulkan_display)) ||
is_android || is_fuchsia || is_ggp || angle_enable_msl_through_spirv)
is_android || is_fuchsia || is_ggp || is_mac)
# When set to true, ANGLE will not use VK_KHR_surface and VK_KHR_swapchain
# extensions. Content can be rendered only off-screen.
@@ -204,7 +200,7 @@ declare_args() {
# the SPIR-V generation path, but leave it disabled on release. It's still used by the metal
# backend nevertheless.
angle_enable_spirv_gen_through_glslang =
is_debug || angle_assert_always_on || angle_enable_msl_through_spirv ||
is_debug || angle_assert_always_on || angle_enable_metal ||
angle_use_spirv_gen_through_glslang
# ISpriteVisual windows cannot be validated and can lead to crashes if an invalid window is