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

Add support for creating 1D textures.

Browse Source 
However there are a lot more things to implement for full support:

 - Copies from/to buffers.
 - Copies from/to other textures.
 - WriteTexture
 - Lazy initialization (if needed)
 - Anything using views and 1D textures in shaders

So they are currently marked as unsafe API.

Bug: dawn:814
Change-Id: I3f1aac87bd5bc27f710d58e525938c1226d093d8
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/64542
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2022-01-13 10:53:36 +00:00
committed by Dawn LUCI CQ
parent 569c92cff7
commit 22bd21ef74
8 changed files with 172 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/tests/unittests/validation/TextureValidationTests.cpp
View File

@@ -291,6 +291,22 @@ namespace {
ASSERT_DEVICE_ERROR(device.CreateTexture(&descriptor));
}
// 1D textures can only have a single mip level.
{
wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.dimension = wgpu::TextureDimension::e1D;
descriptor.size.width = 32;
descriptor.size.height = 1;
// Having a single mip level is allowed.
descriptor.mipLevelCount = 1;
device.CreateTexture(&descriptor);
// Having more than 1 is an error.
descriptor.mipLevelCount = 2;
ASSERT_DEVICE_ERROR(device.CreateTexture(&descriptor));
}
}
// Test the validation of array layer count
@@ -321,6 +337,51 @@ namespace {
}
}
// Test the validation of 1D texture size
TEST_F(TextureValidationTest, 1DTextureSize) {
wgpu::Limits supportedLimits = GetSupportedLimits().limits;
wgpu::TextureDescriptor defaultDescriptor;
defaultDescriptor.size = {4, 1, 1};
defaultDescriptor.dimension = wgpu::TextureDimension::e1D;
defaultDescriptor.usage = wgpu::TextureUsage::CopySrc;
defaultDescriptor.format = wgpu::TextureFormat::RGBA8Unorm;
// Width must be in [1, kMaxTextureDimension1D]
{
wgpu::TextureDescriptor desc = defaultDescriptor;
desc.size.width = 0;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
desc.size.width = 1;
device.CreateTexture(&desc);
desc.size.width = supportedLimits.maxTextureDimension1D;
device.CreateTexture(&desc);
desc.size.width = supportedLimits.maxTextureDimension1D + 1u;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
}
// Height must be 1
{
wgpu::TextureDescriptor desc = defaultDescriptor;
desc.size.height = 2;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
desc.size.height = 0;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
}
// DepthOrArrayLayers must be 1
{
wgpu::TextureDescriptor desc = defaultDescriptor;
desc.size.depthOrArrayLayers = 2;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
desc.size.depthOrArrayLayers = 0;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
}
}
// Test the validation of 2D texture size
TEST_F(TextureValidationTest, 2DTextureSize) {
wgpu::TextureDescriptor defaultDescriptor = CreateDefaultTextureDescriptor();
@@ -427,8 +488,8 @@ namespace {
}
}
// Test that depth/stencil formats are invalid for 3D texture
TEST_F(TextureValidationTest, DepthStencilFormatsFor3D) {
// Test that depth/stencil formats are invalid for 1D and 3D texture
TEST_F(TextureValidationTest, DepthStencilFormatsFor1DAnd3D) {
wgpu::TextureDescriptor descriptor = CreateDefaultTextureDescriptor();
wgpu::TextureFormat depthStencilFormats[] = {
@@ -638,8 +699,6 @@ namespace {
}
}
// TODO(jiawei.shao@intel.com): add tests to verify we cannot create 1D or 3D textures with
// compressed texture formats.
class CompressedTextureFormatsValidationTests : public TextureValidationTest {
protected:
WGPUDevice CreateTestDevice() override {
@@ -649,6 +708,15 @@ namespace {
wgpu::FeatureName::TextureCompressionASTC};
descriptor.requiredFeatures = requiredFeatures;
descriptor.requiredFeaturesCount = 3;
// TODO(dawn:814): Remove when 1D texture support is complete.
const char* kDisallowUnsafeApis = "disallow_unsafe_apis";
wgpu::DawnTogglesDeviceDescriptor togglesDesc;
togglesDesc.forceDisabledToggles = &kDisallowUnsafeApis;
togglesDesc.forceDisabledTogglesCount = 1;
descriptor.nextInChain = &togglesDesc;
return adapter.CreateDevice(&descriptor);
}
@@ -718,6 +786,24 @@ namespace {
}
}
// Test that it is not allowed to create a 1D texture in compressed formats.
TEST_F(CompressedTextureFormatsValidationTests, 1DTexture) {
for (wgpu::TextureFormat format : utils::kCompressedFormats) {
wgpu::TextureDescriptor descriptor = CreateDefaultTextureDescriptor();
descriptor.format = format;
// Unfortunately we can't use the block height here otherwise validation for the max
// texture 1D size will trigger. We check the error message below to make sure the
// correct code path is covered.
descriptor.size.height = 1;
descriptor.size.depthOrArrayLayers = 1;
descriptor.dimension = wgpu::TextureDimension::e1D;
ASSERT_DEVICE_ERROR(
device.CreateTexture(&descriptor),
testing::HasSubstr(
"The dimension (TextureDimension::e1D) of a texture with a compressed format"));
}
}
// Test that it is not allowed to create a 3D texture in compressed formats.
TEST_F(CompressedTextureFormatsValidationTests, 3DTexture) {
for (wgpu::TextureFormat format : utils::kCompressedFormats) {

17
src/tests/unittests/validation/UnsafeAPIValidationTests.cpp
View File

@@ -32,6 +32,23 @@ class UnsafeAPIValidationTest : public ValidationTest {
}
};
// Check that 1D textures are disallowed as part of unsafe APIs.
// TODO(dawn:814): Remove when 1D texture support is complete.
TEST_F(UnsafeAPIValidationTest, 1DTextures) {
wgpu::TextureDescriptor desc;
desc.size = {1, 1, 1};
desc.format = wgpu::TextureFormat::RGBA8Unorm;
desc.usage = wgpu::TextureUsage::CopyDst;
// Control case: 2D textures are allowed.
desc.dimension = wgpu::TextureDimension::e2D;
device.CreateTexture(&desc);
// Error case: 1D textures are disallowed.
desc.dimension = wgpu::TextureDimension::e1D;
ASSERT_DEVICE_ERROR(device.CreateTexture(&desc));
}
// Check that pipeline overridable constants are disallowed as part of unsafe APIs.
// TODO(dawn:1041) Remove when implementation for all backend is added
TEST_F(UnsafeAPIValidationTest, PipelineOverridableConstants) {