From 6d200d53eebe92cc23d358d9cd8b378cabc5ce15 Mon Sep 17 00:00:00 2001 From: Jiawei Shao Date: Wed, 15 Jun 2022 04:43:18 +0000 Subject: [PATCH] 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 Commit-Queue: Jiawei Shao --- src/dawn/utils/TextureUtils.cpp | 1 - src/dawn/utils/TextureUtils.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dawn/utils/TextureUtils.cpp b/src/dawn/utils/TextureUtils.cpp index ad2739f3c9..b630a0c0e7 100644 --- a/src/dawn/utils/TextureUtils.cpp +++ b/src/dawn/utils/TextureUtils.cpp @@ -136,7 +136,6 @@ bool IsDepthOrStencilFormat(wgpu::TextureFormat textureFormat) { 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; diff --git a/src/dawn/utils/TextureUtils.h b/src/dawn/utils/TextureUtils.h index 5b0025d1da..964df10023 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 kAllTextureFormats = { +static constexpr std::array kAllTextureFormats = { wgpu::TextureFormat::R8Unorm, wgpu::TextureFormat::R8Snorm, wgpu::TextureFormat::R8Uint,