Remove build rules for spvc support & spirv-cross fuzzers
Disabling this while refactoring how dependencies are set up to avoid breaking various builds and rolls. BUG=dawn:285 Change-Id: Iaca2614fb73277a1ea850f90a487693cd4c54fcb Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/14040 Reviewed-by: Austin Eng <enga@chromium.org> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
parent
20c014cee7
commit
80d71ecd12
7
BUILD.gn
7
BUILD.gn
|
@ -128,10 +128,6 @@ source_set("libdawn_native_sources") {
|
|||
"third_party:spirv_cross",
|
||||
]
|
||||
defines = []
|
||||
if (dawn_use_spvc) {
|
||||
deps += [ "${dawn_shaderc_dir}:libshaderc_spvc" ]
|
||||
defines += [ "DAWN_USE_SPVC" ]
|
||||
}
|
||||
|
||||
configs += [ ":libdawn_native_internal" ]
|
||||
libs = []
|
||||
|
@ -1197,9 +1193,6 @@ if (dawn_standalone) {
|
|||
group("dawn_fuzzers") {
|
||||
testonly = true
|
||||
deps = [
|
||||
"src/fuzzers:dawn_spirv_cross_glsl_fast_fuzzer",
|
||||
"src/fuzzers:dawn_spirv_cross_hlsl_fast_fuzzer",
|
||||
"src/fuzzers:dawn_spirv_cross_msl_fast_fuzzer",
|
||||
"src/fuzzers:dawn_wire_server_and_frontend_fuzzer",
|
||||
]
|
||||
}
|
||||
|
|
|
@ -16,5 +16,3 @@ shaderc_glslang_dir = "//third_party/glslang"
|
|||
shaderc_spirv_tools_dir = "//third_party/SPIRV-Tools"
|
||||
shaderc_spirv_cross_dir = "//third_party"
|
||||
shaderc_spirv_headers_dir = "//third_party/spirv-headers"
|
||||
|
||||
shaderc_enable_spvc_parser = false
|
||||
|
|
|
@ -44,10 +44,6 @@ declare_args() {
|
|||
# GLSL/HLSL/MSL compiler. This implicitly pulls in the GLSL
|
||||
# compiler, since it is a sub-class of if.
|
||||
dawn_enable_cross_reflection = false
|
||||
|
||||
# Enables using spvc for accessing SPIR-V toolchain, instead of
|
||||
# directly accessing it in Dawn.
|
||||
dawn_use_spvc = false
|
||||
}
|
||||
|
||||
# GN does not allow reading a variable defined in the same declare_args().
|
||||
|
|
|
@ -69,55 +69,6 @@ if (build_with_chromium) {
|
|||
}
|
||||
}
|
||||
|
||||
static_library("dawn_spirv_cross_fuzzer_common") {
|
||||
sources = [
|
||||
"DawnSPIRVCrossFuzzer.cpp",
|
||||
"DawnSPIRVCrossFuzzer.h",
|
||||
]
|
||||
public_deps = [
|
||||
"${dawn_shaderc_dir}:libshaderc_spvc",
|
||||
]
|
||||
}
|
||||
|
||||
# TODO(rharrison): Remove asan_options once signal trap is no longer
|
||||
# needed.
|
||||
# Uses Dawn specific options and varies input data
|
||||
dawn_fuzzer_test("dawn_spirv_cross_glsl_fast_fuzzer") {
|
||||
sources = [
|
||||
"DawnSPIRVCrossGLSLFastFuzzer.cpp",
|
||||
]
|
||||
deps = [
|
||||
":dawn_spirv_cross_fuzzer_common",
|
||||
]
|
||||
asan_options = [ "allow_user_segv_handler=1" ]
|
||||
}
|
||||
|
||||
# TODO(rharrison): Remove asan_options once signal trap is no longer
|
||||
# needed.
|
||||
# Uses Dawn specific options and varies input data
|
||||
dawn_fuzzer_test("dawn_spirv_cross_hlsl_fast_fuzzer") {
|
||||
sources = [
|
||||
"DawnSPIRVCrossHLSLFastFuzzer.cpp",
|
||||
]
|
||||
deps = [
|
||||
":dawn_spirv_cross_fuzzer_common",
|
||||
]
|
||||
asan_options = [ "allow_user_segv_handler=1" ]
|
||||
}
|
||||
|
||||
# TODO(rharrison): Remove asan_options once signal trap is no longer
|
||||
# needed.
|
||||
# Uses Dawn specific options and varies input data
|
||||
dawn_fuzzer_test("dawn_spirv_cross_msl_fast_fuzzer") {
|
||||
sources = [
|
||||
"DawnSPIRVCrossMSLFastFuzzer.cpp",
|
||||
]
|
||||
deps = [
|
||||
":dawn_spirv_cross_fuzzer_common",
|
||||
]
|
||||
asan_options = [ "allow_user_segv_handler=1" ]
|
||||
}
|
||||
|
||||
dawn_fuzzer_test("dawn_wire_server_and_frontend_fuzzer") {
|
||||
sources = [
|
||||
"DawnWireServerAndFrontendFuzzer.cpp",
|
||||
|
|
|
@ -66,9 +66,8 @@ static_library("spirv_cross") {
|
|||
"${spirv_cross_dir}/spirv_parser.hpp",
|
||||
]
|
||||
|
||||
need_glsl_cross =
|
||||
dawn_enable_opengl || dawn_enable_cross_reflection || dawn_use_spvc
|
||||
need_reflection_cross = dawn_enable_cross_reflection || dawn_use_spvc
|
||||
need_glsl_cross = dawn_enable_opengl || dawn_enable_cross_reflection
|
||||
need_reflection_cross = dawn_enable_cross_reflection
|
||||
|
||||
if (dawn_enable_d3d12) {
|
||||
sources += [
|
||||
|
|
Loading…
Reference in New Issue