encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-21 10:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement WebGPU formats on Metal.

Browse Source 
This removes the R5G6B5 format that's only available on iOS on Metal and
leaves A2RGB10 unimplemented because it has inverted R and G channels
compared to Metal's RGB10A2 format.

BUG=dawn:128

Change-Id: I9b960d00f281b4d32318bad3360826b8db5bcb72
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8600
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2019-07-08 09:28:51 +00:00
committed by Commit Bot service account
parent 5df84cea03
commit 7843076b01
5 changed files with 138 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/dawn_native/Texture.cpp
View File

@@ -143,7 +143,6 @@ namespace dawn_native {
case dawn::TextureFormat::RG8Snorm:
case dawn::TextureFormat::RG8Uint:
case dawn::TextureFormat::RG8Sint:
case dawn::TextureFormat::B5G6R5Unorm:
return MakeColorFormat(format, true, 2);
case dawn::TextureFormat::R32Uint:

98
src/dawn_native/metal/TextureMTL.mm
View File

@@ -121,25 +121,105 @@ namespace dawn_native { namespace metal {
MTLPixelFormat MetalPixelFormat(dawn::TextureFormat format) {
switch (format) {
case dawn::TextureFormat::RGBA8Unorm:
return MTLPixelFormatRGBA8Unorm;
case dawn::TextureFormat::RG8Unorm:
return MTLPixelFormatRG8Unorm;
case dawn::TextureFormat::R8Unorm:
return MTLPixelFormatR8Unorm;
case dawn::TextureFormat::RGBA8Uint:
return MTLPixelFormatRGBA8Uint;
case dawn::TextureFormat::RG8Uint:
return MTLPixelFormatRG8Uint;
case dawn::TextureFormat::R8Snorm:
return MTLPixelFormatR8Snorm;
case dawn::TextureFormat::R8Uint:
return MTLPixelFormatR8Uint;
case dawn::TextureFormat::R8Sint:
return MTLPixelFormatR8Sint;
case dawn::TextureFormat::R16Unorm:
return MTLPixelFormatR16Unorm;
case dawn::TextureFormat::R16Snorm:
return MTLPixelFormatR16Snorm;
case dawn::TextureFormat::R16Uint:
return MTLPixelFormatR16Uint;
case dawn::TextureFormat::R16Sint:
return MTLPixelFormatR16Sint;
case dawn::TextureFormat::R16Float:
return MTLPixelFormatR16Float;
case dawn::TextureFormat::RG8Unorm:
return MTLPixelFormatRG8Unorm;
case dawn::TextureFormat::RG8Snorm:
return MTLPixelFormatRG8Snorm;
case dawn::TextureFormat::RG8Uint:
return MTLPixelFormatRG8Uint;
case dawn::TextureFormat::RG8Sint:
return MTLPixelFormatRG8Sint;
case dawn::TextureFormat::R32Uint:
return MTLPixelFormatR32Uint;
case dawn::TextureFormat::R32Sint:
return MTLPixelFormatR32Sint;
case dawn::TextureFormat::R32Float:
return MTLPixelFormatR32Float;
case dawn::TextureFormat::RG16Unorm:
return MTLPixelFormatRG16Unorm;
case dawn::TextureFormat::RG16Snorm:
return MTLPixelFormatRG16Snorm;
case dawn::TextureFormat::RG16Uint:
return MTLPixelFormatRG16Uint;
case dawn::TextureFormat::RG16Sint:
return MTLPixelFormatRG16Sint;
case dawn::TextureFormat::RG16Float:
return MTLPixelFormatRG16Float;
case dawn::TextureFormat::RGBA8Unorm:
return MTLPixelFormatRGBA8Unorm;
case dawn::TextureFormat::RGBA8UnormSrgb:
return MTLPixelFormatRGBA8Unorm_sRGB;
case dawn::TextureFormat::RGBA8Snorm:
return MTLPixelFormatRGBA8Snorm;
case dawn::TextureFormat::RGBA8Uint:
return MTLPixelFormatRGBA8Uint;
case dawn::TextureFormat::RGBA8Sint:
return MTLPixelFormatRGBA8Sint;
case dawn::TextureFormat::BGRA8Unorm:
return MTLPixelFormatBGRA8Unorm;
case dawn::TextureFormat::BGRA8UnormSrgb:
return MTLPixelFormatBGRA8Unorm_sRGB;
case dawn::TextureFormat::A2RGB10Unorm:
// TODO(cwallez@chromium.org): The format expectations are inverted compared to the
// implementation of the format in Metal.
UNREACHABLE();
return MTLPixelFormatRGB10A2Unorm;
case dawn::TextureFormat::B10GR11Float:
return MTLPixelFormatRG11B10Float;
case dawn::TextureFormat::RG32Uint:
return MTLPixelFormatRG32Uint;
case dawn::TextureFormat::RG32Sint:
return MTLPixelFormatRG32Sint;
case dawn::TextureFormat::RG32Float:
return MTLPixelFormatRG32Float;
case dawn::TextureFormat::RGBA16Unorm:
return MTLPixelFormatRGBA16Unorm;
case dawn::TextureFormat::RGBA16Snorm:
return MTLPixelFormatRGBA16Snorm;
case dawn::TextureFormat::RGBA16Uint:
return MTLPixelFormatRGBA16Uint;
case dawn::TextureFormat::RGBA16Sint:
return MTLPixelFormatRGBA16Sint;
case dawn::TextureFormat::RGBA16Float:
return MTLPixelFormatRGBA16Float;
case dawn::TextureFormat::RGBA32Uint:
return MTLPixelFormatRGBA32Uint;
case dawn::TextureFormat::RGBA32Sint:
return MTLPixelFormatRGBA32Sint;
case dawn::TextureFormat::RGBA32Float:
return MTLPixelFormatRGBA32Float;
case dawn::TextureFormat::Depth32Float:
return MTLPixelFormatDepth32Float;
case dawn::TextureFormat::Depth24Plus:
return MTLPixelFormatDepth32Float;
case dawn::TextureFormat::Depth24PlusStencil8:
return MTLPixelFormatDepth32Float_Stencil8;
default:
UNREACHABLE();
return MTLPixelFormatRGBA8Unorm;
}
}

2
src/dawn_native/vulkan/TextureVk.cpp
View File

@@ -238,8 +238,6 @@ namespace dawn_native { namespace vulkan {
return VK_FORMAT_R8G8_UINT;
case dawn::TextureFormat::RG8Sint:
return VK_FORMAT_R8G8_SINT;
case dawn::TextureFormat::B5G6R5Unorm:
return VK_FORMAT_B5G6R5_UNORM_PACK16;
case dawn::TextureFormat::R32Uint:
return VK_FORMAT_R32_UINT;