commit aa5e77b68bce04114250a15bdf2df2c1a413e2e1
author James Price <jrprice@google.com> Wed Jul 19 02:25:21 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 19 02:25:21 2023 +0000
tree 91731332ddfec7a1b0ad39dfca828346f7634a46
parent 225479f0a5f2050a8199d4533ceb2c58acd6f41f

[ir][spirv-writer] Remove logic for depth textures

Since depth textures are now just de-duped to be emitted as regular
textures, we don't need to handle them when emitting texture types.

Bug: tint:1906
Change-Id: Id260a9f9af93dcc2b522073909c0f79d31dab82b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/141442
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>

src/tint/writer/spirv/ir/generator_impl_ir.cc

diff --git a/src/tint/writer/spirv/ir/generator_impl_ir.cc b/src/tint/writer/spirv/ir/generator_impl_ir.cc
index 4de9d85..aa79bce 100644
--- a/src/tint/writer/spirv/ir/generator_impl_ir.cc
+++ b/src/tint/writer/spirv/ir/generator_impl_ir.cc
@@ -344,7 +344,8 @@
 
 uint32_t GeneratorImplIr::Type(const type::Type* ty,
                                builtin::AddressSpace addrspace /* = kUndefined */) {
-    return types_.GetOrCreate(DedupType(ty, ir_->Types()), [&] {
+    ty = DedupType(ty, ir_->Types());
+    return types_.GetOrCreate(ty, [&] {
         auto id = module_.NextId();
         Switch(
             ty,  //
@@ -519,8 +520,6 @@
 void GeneratorImplIr::EmitTextureType(uint32_t id, const type::Texture* texture) {
     uint32_t sampled_type = Switch(
         texture,  //
-        [&](const type::DepthTexture*) { return Type(ir_->Types().f32()); },
-        [&](const type::DepthMultisampledTexture*) { return Type(ir_->Types().f32()); },
         [&](const type::SampledTexture* t) { return Type(t->type()); },
         [&](const type::MultisampledTexture* t) { return Type(t->type()); },
         [&](const type::StorageTexture* t) { return Type(t->type()); });
@@ -560,7 +559,7 @@
         case type::TextureDimension::kCubeArray: {
             dim = SpvDimCube;
             array = 1u;
-            if (texture->IsAnyOf<type::SampledTexture, type::DepthTexture>()) {
+            if (texture->Is<type::SampledTexture>()) {
                 module_.PushCapability(SpvCapabilitySampledCubeArray);
             }
             break;
@@ -573,13 +572,12 @@
     uint32_t depth = 0u;
 
     uint32_t ms = 0u;
-    if (texture->IsAnyOf<type::MultisampledTexture, type::DepthMultisampledTexture>()) {
+    if (texture->Is<type::MultisampledTexture>()) {
         ms = 1u;
     }
 
     uint32_t sampled = 2u;
-    if (texture->IsAnyOf<type::MultisampledTexture, type::SampledTexture, type::DepthTexture,
-                         type::DepthMultisampledTexture>()) {
+    if (texture->IsAnyOf<type::MultisampledTexture, type::SampledTexture>()) {
         sampled = 1u;
     }