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

Add more constants for max texture sizes 

Currently we only implemented 2D and 2DArray texture. kMaxTextureSize
is actually for 2D texture only. This patch adds a few more constants
for texture size for 1D and 3D textures, and changes kMaxTextureSize
to kMaxTextureDimension2D.

Bug: dawn:558

Change-Id: I9088dd7c060dc096a65abea37c7fb01f760524e9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/36540
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
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-01-11 18:04:12 +00:00 committed by Commit Bot service account
parent 77fcdf7eaa
commit 0325e4503b
5 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/Constants.h
View File

@ -58,11 +58,13 @@ static constexpr float kLodMin = 0.0;
static constexpr float kLodMax = 1000.0; static constexpr float kLodMax = 1000.0;
// Max texture size constants // Max texture size constants
static constexpr uint32_t kMaxTextureSize = 8192u; static constexpr uint32_t kMaxTextureDimension1D = 8192u;
static constexpr uint32_t kMaxTexture2DArrayLayers = 256u; static constexpr uint32_t kMaxTextureDimension2D = 8192u;
static constexpr uint32_t kMaxTextureDimension3D = 2048u;
static constexpr uint32_t kMaxTextureArrayLayers = 2048u;
static constexpr uint32_t kMaxTexture2DMipLevels = 14u; static constexpr uint32_t kMaxTexture2DMipLevels = 14u;
static_assert(1 << (kMaxTexture2DMipLevels - 1) == kMaxTextureSize, static_assert(1 << (kMaxTexture2DMipLevels - 1) == kMaxTextureDimension2D,
"kMaxTexture2DMipLevels and kMaxTextureSize size mismatch"); "kMaxTexture2DMipLevels and kMaxTextureDimension2D size mismatch");
// Offset alignment for CopyB2B. Strictly speaking this alignment is required only // Offset alignment for CopyB2B. Strictly speaking this alignment is required only
// on macOS, but we decide to do it on all platforms. // on macOS, but we decide to do it on all platforms.

3
src/dawn_native/SwapChain.cpp
View File

@ -89,7 +89,8 @@ namespace dawn_native {
return DAWN_VALIDATION_ERROR("Swapchain size can't be empty"); return DAWN_VALIDATION_ERROR("Swapchain size can't be empty");
} }
if (descriptor->width > kMaxTextureSize || descriptor->height > kMaxTextureSize) { if (descriptor->width > kMaxTextureDimension2D ||
descriptor->height > kMaxTextureDimension2D) {
return DAWN_VALIDATION_ERROR("Swapchain size too big"); return DAWN_VALIDATION_ERROR("Swapchain size too big");
} }
} }

14
src/dawn_native/Texture.cpp
View File

@ -155,8 +155,8 @@ namespace dawn_native {
MaybeError ValidateTextureSize(const TextureDescriptor* descriptor, const Format* format) { MaybeError ValidateTextureSize(const TextureDescriptor* descriptor, const Format* format) {
ASSERT(descriptor->size.width != 0 && descriptor->size.height != 0); ASSERT(descriptor->size.width != 0 && descriptor->size.height != 0);
if (descriptor->size.width > kMaxTextureSize || if (descriptor->size.width > kMaxTextureDimension2D ||
descriptor->size.height > kMaxTextureSize) { descriptor->size.height > kMaxTextureDimension2D) {
return DAWN_VALIDATION_ERROR("Texture max size exceeded"); return DAWN_VALIDATION_ERROR("Texture max size exceeded");
} }
@ -176,7 +176,7 @@ namespace dawn_native {
} }
if (descriptor->dimension == wgpu::TextureDimension::e2D && if (descriptor->dimension == wgpu::TextureDimension::e2D &&
descriptor->size.depth > kMaxTexture2DArrayLayers) { descriptor->size.depth > kMaxTextureArrayLayers) {
return DAWN_VALIDATION_ERROR("Texture 2D array layer count exceeded"); return DAWN_VALIDATION_ERROR("Texture 2D array layer count exceeded");
} }
if (descriptor->mipLevelCount > kMaxTexture2DMipLevels) { if (descriptor->mipLevelCount > kMaxTexture2DMipLevels) {
@ -444,12 +444,12 @@ namespace dawn_native {
uint32_t TextureBase::GetSubresourceIndex(uint32_t mipLevel, uint32_t TextureBase::GetSubresourceIndex(uint32_t mipLevel,
uint32_t arraySlice, uint32_t arraySlice,
Aspect aspect) const { Aspect aspect) const {
ASSERT(arraySlice <= kMaxTexture2DArrayLayers); ASSERT(arraySlice <= kMaxTextureArrayLayers);
ASSERT(mipLevel <= kMaxTexture2DMipLevels); ASSERT(mipLevel <= kMaxTexture2DMipLevels);
ASSERT(HasOneBit(aspect)); ASSERT(HasOneBit(aspect));
static_assert(kMaxTexture2DMipLevels <= static_assert(
std::numeric_limits<uint32_t>::max() / kMaxTexture2DArrayLayers, kMaxTexture2DMipLevels <= std::numeric_limits<uint32_t>::max() / kMaxTextureArrayLayers,
"texture size overflows uint32_t"); "texture size overflows uint32_t");
return mipLevel + return mipLevel +
GetNumMipLevels() * (arraySlice + GetArrayLayers() * GetAspectIndex(aspect)); GetNumMipLevels() * (arraySlice + GetArrayLayers() * GetAspectIndex(aspect));
} }

12
src/tests/end2end/SwapChainValidationTests.cpp
View File

@ -128,23 +128,23 @@ TEST_P(SwapChainValidationTests, InvalidCreationSize) {
ASSERT_DEVICE_ERROR(device.CreateSwapChain(surface, &desc)); ASSERT_DEVICE_ERROR(device.CreateSwapChain(surface, &desc));
} }
// A width of kMaxTextureSize is valid but kMaxTextureSize + 1 isn't. // A width of kMaxTextureDimension2D is valid but kMaxTextureDimension2D + 1 isn't.
{ {
wgpu::SwapChainDescriptor desc = goodDescriptor; wgpu::SwapChainDescriptor desc = goodDescriptor;
desc.width = kMaxTextureSize; desc.width = kMaxTextureDimension2D;
device.CreateSwapChain(surface, &desc); device.CreateSwapChain(surface, &desc);
desc.width = kMaxTextureSize + 1; desc.width = kMaxTextureDimension2D + 1;
ASSERT_DEVICE_ERROR(device.CreateSwapChain(surface, &desc)); ASSERT_DEVICE_ERROR(device.CreateSwapChain(surface, &desc));
} }
// A height of kMaxTextureSize is valid but kMaxTextureSize + 1 isn't. // A height of kMaxTextureDimension2D is valid but kMaxTextureDimension2D + 1 isn't.
{ {
wgpu::SwapChainDescriptor desc = goodDescriptor; wgpu::SwapChainDescriptor desc = goodDescriptor;
desc.height = kMaxTextureSize; desc.height = kMaxTextureDimension2D;
device.CreateSwapChain(surface, &desc); device.CreateSwapChain(surface, &desc);
desc.height = kMaxTextureSize + 1; desc.height = kMaxTextureDimension2D + 1;
ASSERT_DEVICE_ERROR(device.CreateSwapChain(surface, &desc)); ASSERT_DEVICE_ERROR(device.CreateSwapChain(surface, &desc));
} }
} }

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

@ -213,26 +213,26 @@ namespace {
TEST_F(TextureValidationTest, ArrayLayerCount) { TEST_F(TextureValidationTest, ArrayLayerCount) {
wgpu::TextureDescriptor defaultDescriptor = CreateDefaultTextureDescriptor(); wgpu::TextureDescriptor defaultDescriptor = CreateDefaultTextureDescriptor();
// Array layer count exceeding kMaxTexture2DArrayLayers is not allowed // Array layer count exceeding kMaxTextureArrayLayers is not allowed
{ {
wgpu::TextureDescriptor descriptor = defaultDescriptor; wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.size.depth = kMaxTexture2DArrayLayers + 1u; descriptor.size.depth = kMaxTextureArrayLayers + 1u;
ASSERT_DEVICE_ERROR(device.CreateTexture(&descriptor)); ASSERT_DEVICE_ERROR(device.CreateTexture(&descriptor));
} }
// Array layer count less than kMaxTexture2DArrayLayers is allowed; // Array layer count less than kMaxTextureArrayLayers is allowed;
{ {
wgpu::TextureDescriptor descriptor = defaultDescriptor; wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.size.depth = kMaxTexture2DArrayLayers >> 1; descriptor.size.depth = kMaxTextureArrayLayers >> 1;
device.CreateTexture(&descriptor); device.CreateTexture(&descriptor);
} }
// Array layer count equal to kMaxTexture2DArrayLayers is allowed; // Array layer count equal to kMaxTextureArrayLayers is allowed;
{ {
wgpu::TextureDescriptor descriptor = defaultDescriptor; wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.size.depth = kMaxTexture2DArrayLayers; descriptor.size.depth = kMaxTextureArrayLayers;
device.CreateTexture(&descriptor); device.CreateTexture(&descriptor);
} }
@ -242,29 +242,29 @@ namespace {
TEST_F(TextureValidationTest, TextureSize) { TEST_F(TextureValidationTest, TextureSize) {
wgpu::TextureDescriptor defaultDescriptor = CreateDefaultTextureDescriptor(); wgpu::TextureDescriptor defaultDescriptor = CreateDefaultTextureDescriptor();
// Texture size exceeding kMaxTextureSize is not allowed // Texture size exceeding kMaxTextureDimension2D is not allowed
{ {
wgpu::TextureDescriptor descriptor = defaultDescriptor; wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.size.width = kMaxTextureSize + 1u; descriptor.size.width = kMaxTextureDimension2D + 1u;
descriptor.size.height = kMaxTextureSize + 1u; descriptor.size.height = kMaxTextureDimension2D + 1u;
ASSERT_DEVICE_ERROR(device.CreateTexture(&descriptor)); ASSERT_DEVICE_ERROR(device.CreateTexture(&descriptor));
} }
// Texture size less than kMaxTextureSize is allowed // Texture size less than kMaxTextureDimension2D is allowed
{ {
wgpu::TextureDescriptor descriptor = defaultDescriptor; wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.size.width = kMaxTextureSize >> 1; descriptor.size.width = kMaxTextureDimension2D >> 1;
descriptor.size.height = kMaxTextureSize >> 1; descriptor.size.height = kMaxTextureDimension2D >> 1;
device.CreateTexture(&descriptor); device.CreateTexture(&descriptor);
} }
// Texture equal to kMaxTextureSize is allowed // Texture equal to kMaxTextureDimension2D is allowed
{ {
wgpu::TextureDescriptor descriptor = defaultDescriptor; wgpu::TextureDescriptor descriptor = defaultDescriptor;
descriptor.size.width = kMaxTextureSize; descriptor.size.width = kMaxTextureDimension2D;
descriptor.size.height = kMaxTextureSize; descriptor.size.height = kMaxTextureDimension2D;
device.CreateTexture(&descriptor); device.CreateTexture(&descriptor);
} }