aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Capens <capn@google.com>2020-03-03 10:35:53 -0500
committerNicolas Capens <nicolascapens@google.com>2020-03-03 16:18:59 +0000
commitabc7a30a06c7c135d76032f1346c5d2d1b73f427 (patch)
treebedc8aec62587fe073d125dd5276023536afacdc
parent176f3a3dbbc90d7b2dd9822db709505b4ad41b67 (diff)
downloadswiftshader-abc7a30a06c7c135d76032f1346c5d2d1b73f427.tar.gz
Fix ASTC support for GN build
Defines in BUILD.gn files don't apply transitively to dependencies, so we have to repeat the SWIFTSHADER_ENABLE_ASTC for the Device subdirectory. Note we could also use 'public_configs = [:swiftshader_libvulkan_private_config]' but this adds more defines and build flags than what we need. Since this is intended as a temporary workaround anyway, we're keeping it simple. Bug: b/150600814 Change-Id: Ib06f4a22559ee58114da5841e66e59bfce9aec4a Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/41868 Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Antonio Maiorano <amaiorano@google.com>
-rw-r--r--src/Device/BUILD.gn4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Device/BUILD.gn b/src/Device/BUILD.gn
index 23193f652..6a91ea1e0 100644
--- a/src/Device/BUILD.gn
+++ b/src/Device/BUILD.gn
@@ -72,6 +72,10 @@ swiftshader_source_set("Device") {
"../../third_party/SPIRV-Headers/include",
]
+ defines = [
+ "SWIFTSHADER_ENABLE_ASTC", # TODO(b/150130101)
+ ]
+
deps = [
"../../third_party/marl:Marl_headers",
"../Pipeline:Pipeline_headers",