From 03f38e0cd98bc245fb89b791531275f7b5a73c44 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 11 Jan 2021 22:07:02 +0000 Subject: [PATCH] Update new entry points to use correct namer. This CL fixes up a merge conflict which accidentally used the Unsafe namer instead of the Mangle namer for the temporary API to allow rolling into Chrome. Change-Id: Id3b932d29fe15ab64347350f5b36b3d9efeffbdf Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/37300 Auto-Submit: dan sinclair Reviewed-by: dan sinclair Commit-Queue: dan sinclair --- src/writer/hlsl/generator.cc | 2 +- src/writer/msl/generator.cc | 2 +- src/writer/spirv/generator.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/writer/hlsl/generator.cc b/src/writer/hlsl/generator.cc index 7d4d0885e3..f0dc49a646 100644 --- a/src/writer/hlsl/generator.cc +++ b/src/writer/hlsl/generator.cc @@ -22,7 +22,7 @@ namespace hlsl { Generator::Generator(ast::Module module) : Text(std::move(module)), - namer_(std::make_unique(module_)), + namer_(std::make_unique(module_)), impl_(std::make_unique(module_, namer_.get())) {} Generator::Generator(ast::Module* module) diff --git a/src/writer/msl/generator.cc b/src/writer/msl/generator.cc index 9967928b0d..f1ec8e44c4 100644 --- a/src/writer/msl/generator.cc +++ b/src/writer/msl/generator.cc @@ -22,7 +22,7 @@ namespace msl { Generator::Generator(ast::Module module) : Text(std::move(module)), - namer_(std::make_unique(module_)), + namer_(std::make_unique(module_)), impl_(std::make_unique(module_, namer_.get())) {} Generator::Generator(ast::Module* module) diff --git a/src/writer/spirv/generator.cc b/src/writer/spirv/generator.cc index 5f83610fda..41dfb07065 100644 --- a/src/writer/spirv/generator.cc +++ b/src/writer/spirv/generator.cc @@ -22,7 +22,7 @@ namespace spirv { Generator::Generator(ast::Module module) : writer::Writer(std::move(module)), - namer_(std::make_unique(module_)), + namer_(std::make_unique(module_)), builder_(std::make_unique(module_, namer_.get())), writer_(std::make_unique()) {}