Replace Type::(Is|As)Texture with Castable

Change-Id: I53bbccc3e1e7b88ad8c201997cf7e2e485ad9c81
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/34272
Reviewed-by: dan sinclair <dsinclair@chromium.org>

src/reader/spirv/function.cc

@@ -3711,7 +3711,8 @@ bool FunctionEmitter::EmitSampledImageAccess(
     // integer.
     if (ast::type::PointerType* type =
             parser_impl_.GetTypeForHandleVar(*image)) {
-      if (ast::type::TextureType* texture_type = type->type()->AsTexture()) {
+      if (ast::type::TextureType* texture_type =
+              type->type()->As<ast::type::TextureType>()) {
         if (texture_type->IsDepth()) {
           // Convert it to an unsigned integer type.
           lod_operand = ast_module_.create<ast::TypeConstructorExpression>(
@@ -3782,11 +3783,12 @@ ast::ExpressionList FunctionEmitter::MakeCoordinateOperandsForImageAccess(
     Fail();
     return {};
   }
-  if (!type || !type->type()->IsTexture()) {
+  if (!type || !type->type()->Is<ast::type::TextureType>()) {
     Fail() << "invalid texture type for " << image->PrettyPrint();
     return {};
   }
-  ast::type::TextureDimension dim = type->type()->AsTexture()->dim();
+  ast::type::TextureDimension dim =
+      type->type()->As<ast::type::TextureType>()->dim();
   // Number of regular coordinates.
   uint32_t num_axes = 0;
   bool is_arrayed = false;

src/reader/wgsl/parser_impl_depth_texture_type_test.cc

@@ -36,9 +36,10 @@ TEST_F(ParserImplTest, DepthTextureType_2d) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsDepth());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsDepth());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
   EXPECT_FALSE(p->has_error());
 }
 
@@ -48,9 +49,10 @@ TEST_F(ParserImplTest, DepthTextureType_2dArray) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsDepth());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2dArray);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsDepth());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2dArray);
   EXPECT_FALSE(p->has_error());
 }
 
@@ -60,9 +62,10 @@ TEST_F(ParserImplTest, DepthTextureType_Cube) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsDepth());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::kCube);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsDepth());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::kCube);
   EXPECT_FALSE(p->has_error());
 }
 
@@ -72,9 +75,10 @@ TEST_F(ParserImplTest, DepthTextureType_CubeArray) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsDepth());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::kCubeArray);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsDepth());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::kCubeArray);
   EXPECT_FALSE(p->has_error());
 }
 

src/reader/wgsl/parser_impl_texture_sampler_types_test.cc

@@ -64,9 +64,10 @@ TEST_F(ParserImplTest, TextureSamplerTypes_DepthTexture) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsDepth());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsDepth());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_F32_Old) {
@@ -76,10 +77,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_F32_Old) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->Is<ast::type::F32Type>());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k1d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsSampled()
+                  ->type()
+                  ->Is<ast::type::F32Type>());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k1d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_I32_Old) {
@@ -89,10 +94,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_I32_Old) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->Is<ast::type::I32Type>());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsSampled()
+                  ->type()
+                  ->Is<ast::type::I32Type>());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_U32_Old) {
@@ -102,10 +111,11 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_U32_Old) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->IsU32());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k3d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->AsSampled()->type()->IsU32());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k3d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_Invalid_Old) {
@@ -156,10 +166,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_F32) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->Is<ast::type::F32Type>());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k1d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsSampled()
+                  ->type()
+                  ->Is<ast::type::F32Type>());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k1d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_I32) {
@@ -169,10 +183,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_I32) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->Is<ast::type::I32Type>());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsSampled()
+                  ->type()
+                  ->Is<ast::type::I32Type>());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_U32) {
@@ -182,10 +200,11 @@ TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_U32) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->IsU32());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k3d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->AsSampled()->type()->IsU32());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k3d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_SampledTexture_Invalid) {
@@ -235,11 +254,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_I32) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsMultisampled());
-  ASSERT_TRUE(
-      t->AsTexture()->AsMultisampled()->type()->Is<ast::type::I32Type>());
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsMultisampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsMultisampled()
+                  ->type()
+                  ->Is<ast::type::I32Type>());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_MultisampledTexture_Invalid) {
@@ -290,13 +312,14 @@ TEST_F(ParserImplTest,
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsStorage());
-  EXPECT_EQ(t->AsTexture()->AsStorage()->image_format(),
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsStorage());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->image_format(),
             ast::type::ImageFormat::kR8Unorm);
-  EXPECT_EQ(t->AsTexture()->AsStorage()->access(),
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->access(),
             ast::AccessControl::kReadOnly);
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k1d);
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k1d);
 }
 
 TEST_F(ParserImplTest,
@@ -307,13 +330,14 @@ TEST_F(ParserImplTest,
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsStorage());
-  EXPECT_EQ(t->AsTexture()->AsStorage()->image_format(),
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsStorage());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->image_format(),
             ast::type::ImageFormat::kR16Float);
-  EXPECT_EQ(t->AsTexture()->AsStorage()->access(),
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->access(),
             ast::AccessControl::kWriteOnly);
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_InvalidType_Old) {
@@ -360,13 +384,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Readonly1dR8Unorm) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsStorage());
-  EXPECT_EQ(t->AsTexture()->AsStorage()->image_format(),
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsStorage());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->image_format(),
             ast::type::ImageFormat::kR8Unorm);
-  EXPECT_EQ(t->AsTexture()->AsStorage()->access(),
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->access(),
             ast::AccessControl::kReadOnly);
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k1d);
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k1d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Writeonly2dR16Float) {
@@ -376,13 +401,14 @@ TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_Writeonly2dR16Float) {
   EXPECT_TRUE(t.matched);
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsStorage());
-  EXPECT_EQ(t->AsTexture()->AsStorage()->image_format(),
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsStorage());
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->image_format(),
             ast::type::ImageFormat::kR16Float);
-  EXPECT_EQ(t->AsTexture()->AsStorage()->access(),
+  EXPECT_EQ(t->As<ast::type::TextureType>()->AsStorage()->access(),
             ast::AccessControl::kWriteOnly);
-  EXPECT_EQ(t->AsTexture()->dim(), ast::type::TextureDimension::k2d);
+  EXPECT_EQ(t->As<ast::type::TextureType>()->dim(),
+            ast::type::TextureDimension::k2d);
 }
 
 TEST_F(ParserImplTest, TextureSamplerTypes_StorageTexture_InvalidType) {

src/reader/wgsl/parser_impl_type_decl_test.cc

@@ -764,9 +764,12 @@ TEST_F(ParserImplTest, TypeDecl_Texture_Old) {
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr) << p->error();
   EXPECT_EQ(t.value, type);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->Is<ast::type::F32Type>());
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsSampled()
+                  ->type()
+                  ->Is<ast::type::F32Type>());
 }
 
 TEST_F(ParserImplTest, TypeDecl_Texture) {
@@ -782,9 +785,12 @@ TEST_F(ParserImplTest, TypeDecl_Texture) {
   EXPECT_FALSE(t.errored);
   ASSERT_NE(t.value, nullptr);
   EXPECT_EQ(t.value, type);
-  ASSERT_TRUE(t->IsTexture());
-  ASSERT_TRUE(t->AsTexture()->IsSampled());
-  ASSERT_TRUE(t->AsTexture()->AsSampled()->type()->Is<ast::type::F32Type>());
+  ASSERT_TRUE(t->Is<ast::type::TextureType>());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()->IsSampled());
+  ASSERT_TRUE(t->As<ast::type::TextureType>()
+                  ->AsSampled()
+                  ->type()
+                  ->Is<ast::type::F32Type>());
 }
 
 }  // namespace