Remove substitute transform from public header.
Remove the include for the `SubstituteOverride` transform from tint.h as
it's called by all the backends directly now.
Change-Id: Id3621ba80f9d80d72275dc603ba7938636ca30b7
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/268254
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/include/tint/tint.h b/include/tint/tint.h
index e43534e..4053aab 100644
--- a/include/tint/tint.h
+++ b/include/tint/tint.h
@@ -38,7 +38,6 @@
#include "src/tint/api/common/vertex_pulling_config.h"
#include "src/tint/api/tint.h"
#include "src/tint/lang/core/ir/transform/single_entry_point.h"
-#include "src/tint/lang/core/ir/transform/substitute_overrides.h"
#include "src/tint/lang/core/type/manager.h"
#include "src/tint/lang/wgsl/inspector/inspector.h"
#include "src/tint/utils/diagnostic/formatter.h"
diff --git a/src/tint/cmd/tint/main.cc b/src/tint/cmd/tint/main.cc
index 7df23f9..af5ad46 100644
--- a/src/tint/cmd/tint/main.cc
+++ b/src/tint/cmd/tint/main.cc
@@ -37,13 +37,13 @@
#include "spirv-tools/libspirv.hpp"
#endif // TINT_BUILD_SPV_READER || TINT_BUILD_SPV_WRITER
+#include "src/tint/api/common/substitute_overrides_config.h"
#include "src/tint/api/helpers/generate_bindings.h"
#include "src/tint/api/tint.h"
#include "src/tint/cmd/common/helper.h"
#include "src/tint/lang/core/ir/disassembler.h"
#include "src/tint/lang/core/ir/transform/resource_binding_helper.h"
#include "src/tint/lang/core/ir/transform/single_entry_point.h"
-#include "src/tint/lang/core/ir/transform/substitute_overrides.h"
#include "src/tint/lang/core/ir/var.h"
#include "src/tint/lang/core/type/f16.h"
#include "src/tint/lang/core/type/pointer.h"
@@ -1405,25 +1405,6 @@
return GenerateMsl(options, inspector, ir.Get());
case Format::kGlsl:
return GenerateGlsl(options, inspector, ir.Get());
- default:
- break;
- }
-
- // Run SubstituteOverrides to replace override instructions with constants.
- // This needs to run after SingleEntryPoint which removes unused overrides.
- auto substitute_override_cfg = CreateOverrideMap(options, inspector);
- if (substitute_override_cfg != tint::Success) {
- std::cerr << "Failed to create override map: " << substitute_override_cfg.Failure() << "\n";
- return false;
- }
- auto substituteOverridesResult =
- tint::core::ir::transform::SubstituteOverrides(ir.Get(), substitute_override_cfg.Get());
- if (substituteOverridesResult != tint::Success) {
- std::cerr << "SubstituteOverrides failed:\n" << substituteOverridesResult.Failure() << "\n";
- return false;
- }
-
- switch (options.format) {
case Format::kWgsl:
TINT_UNREACHABLE();
case Format::kNone:
@@ -1432,6 +1413,7 @@
std::cerr << "Unknown output format specified\n";
break;
}
+
#else
std::cerr << "Cannot convert WGSL programs to Tint IR without the WGSL reader\n";
#endif // TINT_BUILD_WGSL_READER