commit 00320c25808ad53085756afddb1fd60f011ed556
author James Price <jrprice@google.com> Mon Jul 26 22:02:28 2021 +0000
committer Tint LUCI CQ <tint-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jul 26 22:02:28 2021 +0000
tree c4caa0e1318885484ba5069e3b5b916dc5b463e6
parent 60d1eb6688f788137edd14a587b5926bd0249597

writer/wgsl: Fix texture_external type emission

Change-Id: I5a622637a03483776b3b4bb2d2b46ad77d3e9eb4
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/59820
Auto-Submit: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

src/transform/robustness_test.cc

diff --git a/src/transform/robustness_test.cc b/src/transform/robustness_test.cc
index 2e1aab6..2e5b96b 100644
--- a/src/transform/robustness_test.cc
+++ b/src/transform/robustness_test.cc
@@ -710,7 +710,7 @@
 
 [[group(0), binding(0)]] var tex_storage_3d : texture_storage_3d<rgba8sint, read>;
 
-[[group(0), binding(0)]] var tex_external : external_texture;
+[[group(0), binding(0)]] var tex_external : texture_external;
 
 fn f() {
   var array_idx : i32;

src/writer/wgsl/generator_impl.cc

diff --git a/src/writer/wgsl/generator_impl.cc b/src/writer/wgsl/generator_impl.cc
index 8607874..d94299d 100644
--- a/src/writer/wgsl/generator_impl.cc
+++ b/src/writer/wgsl/generator_impl.cc
@@ -434,7 +434,7 @@
       out << "_comparison";
     }
   } else if (ty->Is<ast::ExternalTexture>()) {
-    out << "external_texture";
+    out << "texture_external";
   } else if (auto* texture = ty->As<ast::Texture>()) {
     out << "texture_";
     if (texture->Is<ast::DepthTexture>()) {

test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl

diff --git a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl
index 3fef31b..040e401 100644
--- a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-[[group(1), binding(0)]] var arg_0 : external_texture;
+[[group(1), binding(0)]] var arg_0 : texture_external;
 
 fn ignore_5c9edf() {
   ignore(arg_0);

test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.wgsl

diff --git a/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.wgsl b/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.wgsl
index c58a205..2ea9581 100644
--- a/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-[[group(1), binding(0)]] var arg_0 : external_texture;
+[[group(1), binding(0)]] var arg_0 : texture_external;
 
 fn textureDimensions_ba1481() {
   var res : vec2<i32> = textureDimensions(arg_0);

test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.wgsl

diff --git a/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.wgsl b/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.wgsl
index 2c5a61f..769efb3 100644
--- a/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-[[group(1), binding(0)]] var arg_0 : external_texture;
+[[group(1), binding(0)]] var arg_0 : texture_external;
 
 fn textureLoad_8acf41() {
   var res : vec4<f32> = textureLoad(arg_0, vec2<i32>());

test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.wgsl

diff --git a/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.wgsl b/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.wgsl
index b17fef2..eef21a3 100644
--- a/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.wgsl
+++ b/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.wgsl
@@ -1,4 +1,4 @@
-[[group(1), binding(0)]] var arg_0 : external_texture;
+[[group(1), binding(0)]] var arg_0 : texture_external;
 
 [[group(1), binding(1)]] var arg_1 : sampler;