[tint] Remove writer::Writer Nothing uses this. Bug: tint:1988 Change-Id: I75f1ab0f84cf33984c6def0a74a75c2b69a08435 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/143001 Auto-Submit: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com>
diff --git a/include/tint/tint.h b/include/tint/tint.h index 0243fa6..a2cfb19 100644 --- a/include/tint/tint.h +++ b/include/tint/tint.h
@@ -34,7 +34,6 @@ #include "src/tint/writer/binding_point.h" #include "src/tint/writer/binding_remapper_options.h" #include "src/tint/writer/external_texture_options.h" -#include "src/tint/writer/writer.h" #if TINT_BUILD_SPV_READER #include "src/tint/lang/spirv/reader/parser.h"
diff --git a/src/tint/BUILD.gn b/src/tint/BUILD.gn index 1d6791f..d2e27c1 100644 --- a/src/tint/BUILD.gn +++ b/src/tint/BUILD.gn
@@ -987,10 +987,6 @@ "writer/binding_remapper_options.h", "writer/external_texture_options.cc", "writer/external_texture_options.h", - "writer/text.cc", - "writer/text.h", - "writer/writer.cc", - "writer/writer.h", ] deps = [
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt index 60f5d39..23c0112 100644 --- a/src/tint/CMakeLists.txt +++ b/src/tint/CMakeLists.txt
@@ -579,10 +579,6 @@ writer/external_texture_options.h writer/ir_text_generator.cc writer/ir_text_generator.h - writer/text.cc - writer/text.h - writer/writer.cc - writer/writer.h ) tint_generated(lang/core/builtin/access BENCH TEST)
diff --git a/src/tint/lang/glsl/ast_writer/generator.h b/src/tint/lang/glsl/ast_writer/generator.h index 8ca98fa..a5f8075 100644 --- a/src/tint/lang/glsl/ast_writer/generator.h +++ b/src/tint/lang/glsl/ast_writer/generator.h
@@ -28,7 +28,6 @@ #include "src/tint/lang/wgsl/sem/binding_point.h" #include "src/tint/lang/wgsl/sem/sampler_texture_pair.h" #include "src/tint/writer/external_texture_options.h" -#include "src/tint/writer/text.h" // Forward declarations namespace tint {
diff --git a/src/tint/lang/hlsl/ast_writer/generator.h b/src/tint/lang/hlsl/ast_writer/generator.h index 0b4cefa..94dabe3 100644 --- a/src/tint/lang/hlsl/ast_writer/generator.h +++ b/src/tint/lang/hlsl/ast_writer/generator.h
@@ -30,7 +30,6 @@ #include "src/tint/writer/array_length_from_uniform_options.h" #include "src/tint/writer/binding_remapper_options.h" #include "src/tint/writer/external_texture_options.h" -#include "src/tint/writer/text.h" // Forward declarations namespace tint {
diff --git a/src/tint/lang/msl/ast_writer/generator.h b/src/tint/lang/msl/ast_writer/generator.h index b99d632..ffaf9dd 100644 --- a/src/tint/lang/msl/ast_writer/generator.h +++ b/src/tint/lang/msl/ast_writer/generator.h
@@ -25,7 +25,6 @@ #include "src/tint/writer/array_length_from_uniform_options.h" #include "src/tint/writer/binding_remapper_options.h" #include "src/tint/writer/external_texture_options.h" -#include "src/tint/writer/text.h" // Forward declarations namespace tint {
diff --git a/src/tint/lang/spirv/ast_writer/generator.h b/src/tint/lang/spirv/ast_writer/generator.h index c975510..3ce4ecb 100644 --- a/src/tint/lang/spirv/ast_writer/generator.h +++ b/src/tint/lang/spirv/ast_writer/generator.h
@@ -22,7 +22,6 @@ #include "src/tint/utils/reflection/reflection.h" #include "src/tint/writer/binding_remapper_options.h" #include "src/tint/writer/external_texture_options.h" -#include "src/tint/writer/writer.h" // Forward declarations namespace tint {
diff --git a/src/tint/lang/wgsl/ast_writer/generator.h b/src/tint/lang/wgsl/ast_writer/generator.h index 1f0d65d..a6959d9 100644 --- a/src/tint/lang/wgsl/ast_writer/generator.h +++ b/src/tint/lang/wgsl/ast_writer/generator.h
@@ -18,8 +18,6 @@ #include <memory> #include <string> -#include "src/tint/writer/text.h" - // Forward declarations namespace tint { class Program;
diff --git a/src/tint/lang/wgsl/syntax_tree_writer/generator.h b/src/tint/lang/wgsl/syntax_tree_writer/generator.h index 8f16497..7007a65 100644 --- a/src/tint/lang/wgsl/syntax_tree_writer/generator.h +++ b/src/tint/lang/wgsl/syntax_tree_writer/generator.h
@@ -18,8 +18,6 @@ #include <memory> #include <string> -#include "src/tint/writer/text.h" - // Forward declarations namespace tint { class Program;
diff --git a/src/tint/writer/text.cc b/src/tint/writer/text.cc deleted file mode 100644 index 3e41f75..0000000 --- a/src/tint/writer/text.cc +++ /dev/null
@@ -1,21 +0,0 @@ -// Copyright 2020 The Tint Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "src/tint/writer/text.h" - -namespace tint::writer { - -Text::~Text() = default; - -} // namespace tint::writer
diff --git a/src/tint/writer/text.h b/src/tint/writer/text.h deleted file mode 100644 index 0590eba..0000000 --- a/src/tint/writer/text.h +++ /dev/null
@@ -1,35 +0,0 @@ -// Copyright 2020 The Tint Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef SRC_TINT_WRITER_TEXT_H_ -#define SRC_TINT_WRITER_TEXT_H_ - -#include <string> - -#include "src/tint/writer/writer.h" - -namespace tint::writer { - -/// Class to generate text source -class Text : public Writer { - public: - ~Text() override; - - /// @returns the result data - virtual std::string Result() const = 0; -}; - -} // namespace tint::writer - -#endif // SRC_TINT_WRITER_TEXT_H_
diff --git a/src/tint/writer/writer.cc b/src/tint/writer/writer.cc deleted file mode 100644 index 3c7e098..0000000 --- a/src/tint/writer/writer.cc +++ /dev/null
@@ -1,21 +0,0 @@ -// Copyright 2020 The Tint Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "src/tint/writer/writer.h" - -namespace tint::writer { - -Writer::~Writer() = default; - -} // namespace tint::writer
diff --git a/src/tint/writer/writer.h b/src/tint/writer/writer.h deleted file mode 100644 index ea7016e..0000000 --- a/src/tint/writer/writer.h +++ /dev/null
@@ -1,45 +0,0 @@ -// Copyright 2020 The Tint Authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef SRC_TINT_WRITER_WRITER_H_ -#define SRC_TINT_WRITER_WRITER_H_ - -#include <string> - -namespace tint::writer { - -/// Base class for the output writers -class Writer { - public: - virtual ~Writer(); - - /// @returns the writer error string - const std::string& error() const { return error_; } - - /// Converts the module into the desired format - /// @returns true on success; false on failure - virtual bool Generate() = 0; - - protected: - /// Sets the error string - /// @param msg the error message - void set_error(const std::string& msg) { error_ = msg; } - - /// An error message, if an error was encountered - std::string error_; -}; - -} // namespace tint::writer - -#endif // SRC_TINT_WRITER_WRITER_H_