Fix check_includes_strict violations in swiftshader. This is a part of https://docs.google.com/document/d/1zYUC_zuFrZozo9ogFHcf0Rzkiw9W7RVnaY-1fzfQ0AM/edit?tab=t.0 Bug: 556959580 Change-Id: I263312e1314e4e4b889bf50bcdec04a86a6a6964 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/77848 Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@google.com> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: Yuly Novikov <ynovikov@chromium.org>
diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn index f212308..d7b5350 100644 --- a/src/Reactor/BUILD.gn +++ b/src/Reactor/BUILD.gn
@@ -287,6 +287,7 @@ ":swiftshader_reactor_base", ":swiftshader_subzero", "../../third_party/marl:Marl", + "../../third_party/marl:Marl_headers", ] sources = [
diff --git a/src/System/BUILD.gn b/src/System/BUILD.gn index 2fc84d5..e61adeb 100644 --- a/src/System/BUILD.gn +++ b/src/System/BUILD.gn
@@ -52,7 +52,10 @@ include_dirs = [ ".." ] - deps = [ "../../third_party/marl:Marl" ] + deps = [ + "../../third_party/marl:Marl", + "../../third_party/marl:Marl_headers", + ] public_deps = [ ":System_headers" ] }
diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn index 6112337..03ec350 100644 --- a/src/Vulkan/BUILD.gn +++ b/src/Vulkan/BUILD.gn
@@ -197,6 +197,7 @@ "../../third_party/SPIRV-Tools/include", "../../third_party/SPIRV-Headers/include", ] + deps = [ "../../third_party/marl:Marl_headers" ] } swiftshader_shared_library("swiftshader_libvulkan") {
diff --git a/src/WSI/BUILD.gn b/src/WSI/BUILD.gn index 9a82a2f..14f2b92 100644 --- a/src/WSI/BUILD.gn +++ b/src/WSI/BUILD.gn
@@ -61,7 +61,7 @@ "Win32SurfaceKHR.hpp", ] } - + public_deps = [ "../Vulkan:swiftshader_libvulkan_headers" ] if (is_mac) { sources += [ "MetalSurface.hpp", @@ -84,7 +84,6 @@ "../../third_party/SPIRV-Tools:spvtools_headers", "../../third_party/marl:Marl_headers", "../System", - "../Vulkan:swiftshader_libvulkan_headers", ] # Do not try to depend on Wayland if the |wayland_gn_dir| is not set.
diff --git a/tests/ReactorUnitTests/BUILD.gn b/tests/ReactorUnitTests/BUILD.gn index b683718..0cbb6e0 100644 --- a/tests/ReactorUnitTests/BUILD.gn +++ b/tests/ReactorUnitTests/BUILD.gn
@@ -22,6 +22,7 @@ "//base/test:test_support", "//testing/gmock", "//testing/gtest", + "//third_party/googletest:gtest", "//third_party/swiftshader/src/Reactor:swiftshader_llvm_reactor", ] @@ -44,6 +45,7 @@ "//base/test:test_support", "//testing/gmock", "//testing/gtest", + "//third_party/googletest:gtest", "//third_party/swiftshader/src/Reactor:swiftshader_subzero_reactor", ]
diff --git a/third_party/SPIRV-Tools/BUILD.gn b/third_party/SPIRV-Tools/BUILD.gn index 40e1fbb..e1d2a7e 100644 --- a/third_party/SPIRV-Tools/BUILD.gn +++ b/third_party/SPIRV-Tools/BUILD.gn
@@ -174,10 +174,12 @@ grammar_file = "${spirv_headers}/include/spirv/unified1/extinst.debuginfo.grammar.json" } + spvtools_language_header("cldebuginfo100") { name = "OpenCLDebugInfo100" grammar_file = "${spirv_headers}/include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json" } + spvtools_language_header("vkdebuginfo100") { name = "NonSemanticShaderDebugInfo100" grammar_file = "${spirv_headers}/include/spirv/unified1/extinst.nonsemantic.shader.debuginfo.100.grammar.json" @@ -246,7 +248,6 @@ static_library("spvtools") { deps = [ - ":spvtools_core_tables", ":spvtools_generators_inc", ":spvtools_language_header_cldebuginfo100", ":spvtools_language_header_debuginfo", @@ -329,6 +330,7 @@ ] public_deps = [ + ":spvtools_core_tables", ":spvtools_headers", "${spirv_headers}:spv_headers", ] @@ -400,12 +402,15 @@ ] deps = [ - ":spvtools", ":spvtools_language_header_cldebuginfo100", ":spvtools_language_header_debuginfo", ":spvtools_language_header_vkdebuginfo100", + "${spirv_headers}:spv_headers", ] - public_deps = [ ":spvtools_headers" ] + public_deps = [ + ":spvtools", + ":spvtools_headers", + ] if (build_with_chromium) { configs -= [ "//build/config/compiler:chromium_code" ] @@ -661,10 +666,11 @@ ] deps = [ - ":spvtools", ":spvtools_language_header_debuginfo", + "${spirv_headers}:spv_headers", ] public_deps = [ + ":spvtools", ":spvtools_headers", ":spvtools_language_header_cldebuginfo100", ":spvtools_language_header_vkdebuginfo100", @@ -755,11 +761,11 @@ "source/reduce/structured_loop_to_selection_reduction_opportunity_finder.cpp", "source/reduce/structured_loop_to_selection_reduction_opportunity_finder.h", ] - deps = [ - ":spvtools", + deps = [ ":spvtools" ] + public_deps = [ + ":spvtools_headers", ":spvtools_opt", ] - public_deps = [ ":spvtools_headers" ] if (build_with_chromium) { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] @@ -1306,8 +1312,9 @@ "tools/util/cli_consumer.h", "tools/util/flags.cpp", ] - deps = [ ":spvtools_headers" ] + configs += [ ":spvtools_internal_config" ] + public_deps = [ ":spvtools_headers" ] } source_set("spvtools_tools_io") {