commit 6d200d53eebe92cc23d358d9cd8b378cabc5ce15
author Jiawei Shao <jiawei.shao@intel.com> Wed Jun 15 04:43:18 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 15 04:43:18 2022 +0000
tree eda058896b748cd4dfbebc76c35328d10b098622
parent 314840bba1078acae936680ffac87b7bbae3aead

Remove Depth24Unorm-stencil8 from IsDepthOrStencilFormat

This patch removes Depth24Unorm-stencil8 from IsDepthOrStencilFormat
to resolve a compilation error in latest Dawn.

Bug: 1459
Change-Id: Ic9a4aa669f28803eeeeea5280ad26d54897b35d3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/93740
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>

src/dawn/utils/TextureUtils.cpp

diff --git a/src/dawn/utils/TextureUtils.cpp b/src/dawn/utils/TextureUtils.cpp
index ad2739f..b630a0c 100644
--- a/src/dawn/utils/TextureUtils.cpp
+++ b/src/dawn/utils/TextureUtils.cpp
@@ -136,7 +136,6 @@
         case wgpu::TextureFormat::Depth24Plus:
         case wgpu::TextureFormat::Depth32Float:
         case wgpu::TextureFormat::Depth24PlusStencil8:
-        case wgpu::TextureFormat::Depth24UnormStencil8:
         case wgpu::TextureFormat::Depth32FloatStencil8:
         case wgpu::TextureFormat::Stencil8:
             return true;

src/dawn/utils/TextureUtils.h

diff --git a/src/dawn/utils/TextureUtils.h b/src/dawn/utils/TextureUtils.h
index 5b0025d..964df10 100644
--- a/src/dawn/utils/TextureUtils.h
+++ b/src/dawn/utils/TextureUtils.h
@@ -22,7 +22,7 @@
 #include "dawn/common/Assert.h"
 
 namespace utils {
-static constexpr std::array<wgpu::TextureFormat, 95> kAllTextureFormats = {
+static constexpr std::array<wgpu::TextureFormat, 94> kAllTextureFormats = {
     wgpu::TextureFormat::R8Unorm,
     wgpu::TextureFormat::R8Snorm,
     wgpu::TextureFormat::R8Uint,