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

Implement 3D textures and views creation on Vulkan/Metal/GL 

Bug: dawn:547
Change-Id: I1f800f69d8ecfef5a7cfe9c19c320ea78296c58d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/40120
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Yunchao He <yunchao.he@intel.com>
This commit is contained in:
Yunchao He 2021-02-03 16:36:59 +00:00 committed by Commit Bot service account
parent f2a003d4e9
commit 1b9bcfc47d
4 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,10 @@ namespace dawn_native { namespace metal {
return MTLTextureTypeCube; return MTLTextureTypeCube;
case wgpu::TextureViewDimension::CubeArray: case wgpu::TextureViewDimension::CubeArray:
return MTLTextureTypeCubeArray; return MTLTextureTypeCubeArray;
case wgpu::TextureViewDimension::e3D:
return MTLTextureType3D;
case wgpu::TextureViewDimension::e1D: case wgpu::TextureViewDimension::e1D:
case wgpu::TextureViewDimension::e3D:
case wgpu::TextureViewDimension::Undefined: case wgpu::TextureViewDimension::Undefined:
UNREACHABLE(); UNREACHABLE();
} }
@ -333,9 +334,12 @@ namespace dawn_native { namespace metal {
} }
} }
break; break;
case wgpu::TextureDimension::e3D:
ASSERT(mtlDesc.sampleCount == 1);
mtlDesc.textureType = MTLTextureType3D;
break;
case wgpu::TextureDimension::e1D: case wgpu::TextureDimension::e1D:
case wgpu::TextureDimension::e3D:
UNREACHABLE(); UNREACHABLE();
} }

13
src/dawn_native/opengl/TextureGL.cpp
View File

@ -39,9 +39,10 @@ namespace dawn_native { namespace opengl {
return GL_TEXTURE_2D; return GL_TEXTURE_2D;
} }
} }
case wgpu::TextureDimension::e3D:
return GL_TEXTURE_3D;
case wgpu::TextureDimension::e1D: case wgpu::TextureDimension::e1D:
case wgpu::TextureDimension::e3D:
UNREACHABLE(); UNREACHABLE();
} }
} }
@ -62,9 +63,10 @@ namespace dawn_native { namespace opengl {
return GL_TEXTURE_CUBE_MAP; return GL_TEXTURE_CUBE_MAP;
case wgpu::TextureViewDimension::CubeArray: case wgpu::TextureViewDimension::CubeArray:
return GL_TEXTURE_CUBE_MAP_ARRAY; return GL_TEXTURE_CUBE_MAP_ARRAY;
case wgpu::TextureViewDimension::e3D:
return GL_TEXTURE_3D;
case wgpu::TextureViewDimension::e1D: case wgpu::TextureViewDimension::e1D:
case wgpu::TextureViewDimension::e3D:
case wgpu::TextureViewDimension::Undefined: case wgpu::TextureViewDimension::Undefined:
UNREACHABLE(); UNREACHABLE();
} }
@ -153,9 +155,14 @@ namespace dawn_native { namespace opengl {
} }
} }
break; break;
case wgpu::TextureDimension::e3D:
ASSERT(!IsMultisampledTexture());
ASSERT(arrayLayers == 1);
gl.TexStorage3D(mTarget, levels, glFormat.internalFormat, width, height,
GetDepth());
break;
case wgpu::TextureDimension::e1D: case wgpu::TextureDimension::e1D:
case wgpu::TextureDimension::e3D:
UNREACHABLE(); UNREACHABLE();
} }

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

@ -45,9 +45,10 @@ namespace dawn_native { namespace vulkan {
return VK_IMAGE_VIEW_TYPE_CUBE; return VK_IMAGE_VIEW_TYPE_CUBE;
case wgpu::TextureViewDimension::CubeArray: case wgpu::TextureViewDimension::CubeArray:
return VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; return VK_IMAGE_VIEW_TYPE_CUBE_ARRAY;
case wgpu::TextureViewDimension::e3D:
return VK_IMAGE_VIEW_TYPE_3D;
case wgpu::TextureViewDimension::e1D: case wgpu::TextureViewDimension::e1D:
case wgpu::TextureViewDimension::e3D:
case wgpu::TextureViewDimension::Undefined: case wgpu::TextureViewDimension::Undefined:
UNREACHABLE(); UNREACHABLE();
} }
@ -201,8 +202,13 @@ namespace dawn_native { namespace vulkan {
info->arrayLayers = size.depth; info->arrayLayers = size.depth;
break; break;
case wgpu::TextureDimension::e1D:
case wgpu::TextureDimension::e3D: case wgpu::TextureDimension::e3D:
info->imageType = VK_IMAGE_TYPE_3D;
info->extent = {size.width, size.height, size.depth};
info->arrayLayers = 1;
break;
case wgpu::TextureDimension::e1D:
UNREACHABLE(); UNREACHABLE();
} }
} }

7
src/tests/end2end/TextureViewTests.cpp
View File

@ -701,4 +701,9 @@ TEST_P(TextureView3DTest, BasicTest) {
wgpu::TextureView view = texture.CreateView(); wgpu::TextureView view = texture.CreateView();
} }
DAWN_INSTANTIATE_TEST(TextureView3DTest, D3D12Backend()); DAWN_INSTANTIATE_TEST(TextureView3DTest,
D3D12Backend(),
MetalBackend(),
OpenGLBackend(),
OpenGLESBackend(),
VulkanBackend());