mirror of
https://github.com/godotengine/godot-angle-static.git
synced 2026-01-04 22:09:59 +03:00
Upstream Apple's direct-to-Metal backend: compile libANGLE.
This change is meant to merge the metal backend changes from Apple's direct-to-Metal backend. Taken from Kyle Piddington's CL: https://chromium-review.googlesource.com/c/angle/angle/+/2857366/ The goal of this CL is to merge the metal backend code in a state that compiles, but not to switch the Metal backend over to using the direct-to-metal backend yet. Bug: angleproject:5505 Bug: angleproject:6127 Change-Id: If6783e06e0086b3a1dd25c6f53caca5cfc96cb86 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2950067 Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Kenneth Russell <kbr@chromium.org> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
This commit is contained in:
committed by
Angle LUCI CQ
parent
b7cfbac4f8
commit
d33a22228e
5
third_party/BUILD.gn
vendored
5
third_party/BUILD.gn
vendored
@@ -5,7 +5,6 @@
|
||||
# See:
|
||||
# https://chromium.googlesource.com/chromium/src/+/master/third_party/BUILD.gn
|
||||
|
||||
import("//build_overrides/angle.gni")
|
||||
import("//third_party/libjpeg.gni")
|
||||
|
||||
assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
|
||||
@@ -26,7 +25,7 @@ group("jpeg") {
|
||||
if (use_system_libjpeg) {
|
||||
public_configs = [ ":system_libjpeg_config" ]
|
||||
} else if (use_libjpeg_turbo) {
|
||||
public_deps = [ "$angle_libjpeg_turbo_dir:libjpeg" ]
|
||||
public_deps = [ "//third_party/libjpeg_turbo:libjpeg" ]
|
||||
public_configs = [ ":libjpeg_turbo_config" ]
|
||||
} else {
|
||||
public_deps = [ "//third_party/libjpeg:libjpeg" ]
|
||||
@@ -41,7 +40,7 @@ group("jpeg_includes") {
|
||||
if (use_system_libjpeg) {
|
||||
public_configs = [ ":system_libjpeg_config" ]
|
||||
} else if (use_libjpeg_turbo) {
|
||||
public_configs = [ "$angle_libjpeg_turbo_dir:libjpeg_config" ]
|
||||
public_configs = [ "//third_party/libjpeg_turbo:libjpeg_config" ]
|
||||
} else {
|
||||
public_configs = [ "//third_party/libjpeg:libjpeg_config" ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user