src/transform: Remove deprecated APIs

These have now been removed from Dawn.

Change-Id: I50e784141e6eb07f4f0d3f508bb8c6199429dd63
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/48044
Auto-Submit: Ben Clayton <bclayton@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
Ben Clayton
2021-04-26 20:38:36 +00:00
committed by Commit Bot service account
parent 19b4b6cc2b
commit 5d5ec24571
13 changed files with 46 additions and 51 deletions

View File

@@ -19,15 +19,14 @@ namespace fuzzers {
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
tint::transform::Manager transform_manager;
transform_manager.append(
std::make_unique<tint::transform::BoundArrayAccessors>());
transform_manager.append(
std::make_unique<tint::transform::EmitVertexPointSize>());
transform_manager.append(
std::make_unique<tint::transform::FirstIndexOffset>(0, 0));
tint::transform::DataMap transform_inputs;
transform_inputs.Add<tint::transform::FirstIndexOffset::BindingPoint>(0, 0);
transform_manager.Add<tint::transform::BoundArrayAccessors>();
transform_manager.Add<tint::transform::EmitVertexPointSize>();
transform_manager.Add<tint::transform::FirstIndexOffset>();
tint::fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
fuzzer.SetTransformManager(&transform_manager);
fuzzer.SetTransformManager(&transform_manager, std::move(transform_inputs));
return fuzzer.Run(data, size);
}

View File

@@ -19,11 +19,10 @@ namespace fuzzers {
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
tint::transform::Manager transform_manager;
transform_manager.append(
std::make_unique<tint::transform::BoundArrayAccessors>());
transform_manager.Add<tint::transform::BoundArrayAccessors>();
tint::fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
fuzzer.SetTransformManager(&transform_manager);
fuzzer.SetTransformManager(&transform_manager, {});
return fuzzer.Run(data, size);
}

View File

@@ -147,7 +147,7 @@ int CommonFuzzer::Run(const uint8_t* data, size_t size) {
}
if (transform_manager_) {
auto out = transform_manager_->Run(&program);
auto out = transform_manager_->Run(&program, transform_inputs_);
if (!out.program.IsValid()) {
return 0;
}

View File

@@ -15,6 +15,8 @@
#ifndef FUZZERS_TINT_COMMON_FUZZER_H_
#define FUZZERS_TINT_COMMON_FUZZER_H_
#include <utility>
#include "include/tint/tint.h"
namespace tint {
@@ -29,7 +31,10 @@ class CommonFuzzer {
explicit CommonFuzzer(InputFormat input, OutputFormat output);
~CommonFuzzer();
void SetTransformManager(transform::Manager* tm) { transform_manager_ = tm; }
void SetTransformManager(transform::Manager* tm, transform::DataMap inputs) {
transform_manager_ = tm;
transform_inputs_ = std::move(inputs);
}
void EnableInspector() { inspector_enabled_ = true; }
int Run(const uint8_t* data, size_t size);
@@ -38,6 +43,7 @@ class CommonFuzzer {
InputFormat input_;
OutputFormat output_;
transform::Manager* transform_manager_;
transform::DataMap transform_inputs_;
bool inspector_enabled_;
};

View File

@@ -19,11 +19,10 @@ namespace fuzzers {
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
tint::transform::Manager transform_manager;
transform_manager.append(
std::make_unique<tint::transform::EmitVertexPointSize>());
transform_manager.Add<tint::transform::EmitVertexPointSize>();
tint::fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
fuzzer.SetTransformManager(&transform_manager);
fuzzer.SetTransformManager(&transform_manager, {});
return fuzzer.Run(data, size);
}

View File

@@ -19,11 +19,12 @@ namespace fuzzers {
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
tint::transform::Manager transform_manager;
transform_manager.append(
std::make_unique<tint::transform::FirstIndexOffset>(0, 0));
tint::transform::DataMap transform_inputs;
transform_inputs.Add<tint::transform::FirstIndexOffset::BindingPoint>(0, 0);
transform_manager.Add<tint::transform::FirstIndexOffset>();
tint::fuzzers::CommonFuzzer fuzzer(InputFormat::kWGSL, OutputFormat::kSpv);
fuzzer.SetTransformManager(&transform_manager);
fuzzer.SetTransformManager(&transform_manager, std::move(transform_inputs));
return fuzzer.Run(data, size);
}