encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jiawei Shao 2022-06-15 04:43:18 +00:00 committed by Dawn LUCI CQ
parent 314840bba1
commit 6d200d53ee
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dawn/utils/TextureUtils.cpp
View File

@ -136,7 +136,6 @@ bool IsDepthOrStencilFormat(wgpu::TextureFormat textureFormat) {
case wgpu::TextureFormat::Depth24Plus: case wgpu::TextureFormat::Depth24Plus:
case wgpu::TextureFormat::Depth32Float: case wgpu::TextureFormat::Depth32Float:
case wgpu::TextureFormat::Depth24PlusStencil8: case wgpu::TextureFormat::Depth24PlusStencil8:
case wgpu::TextureFormat::Depth24UnormStencil8:
case wgpu::TextureFormat::Depth32FloatStencil8: case wgpu::TextureFormat::Depth32FloatStencil8:
case wgpu::TextureFormat::Stencil8: case wgpu::TextureFormat::Stencil8:
return true; return true;

2
src/dawn/utils/TextureUtils.h
View File

@ -22,7 +22,7 @@
#include "dawn/common/Assert.h" #include "dawn/common/Assert.h"
namespace utils { namespace utils {
static constexpr std::array<wgpu::TextureFormat, 95> kAllTextureFormats = { static constexpr std::array<wgpu::TextureFormat, 94> kAllTextureFormats = {
wgpu::TextureFormat::R8Unorm, wgpu::TextureFormat::R8Unorm,
wgpu::TextureFormat::R8Snorm, wgpu::TextureFormat::R8Snorm,
wgpu::TextureFormat::R8Uint, wgpu::TextureFormat::R8Uint,