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

Move a function to TextureFormatUtils.h|.cpp and rename these two util files

Browse Source 
This change moves function ViewDimensionToTextureDimension() to
TextureFormatUtils.h|.cpp.

This change also renames TextureFormatUtils.h|.cpp to TextureUtils.h|.cpp
because the new name makes more sense now.

Bug: dawn:547

Change-Id: I183c68d26365a6cda722be55b8ba3556c1b4c82b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/57482
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>
This commit is contained in:
Yunchao He
2021-07-09 02:47:49 +00:00
committed by Dawn LUCI CQ
parent 3185d9ce1f
commit 9749f5a9f5
19 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/unittests/validation/CopyCommandsValidationTests.cpp
View File

@@ -17,7 +17,7 @@
#include "common/Math.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/TestUtils.h"
#include "utils/TextureFormatUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
class CopyCommandTest : public ValidationTest {

2
src/tests/unittests/validation/CopyTextureForBrowserTests.cpp
View File

@@ -17,7 +17,7 @@
#include "common/Math.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/TestUtils.h"
#include "utils/TextureFormatUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
class CopyTextureForBrowserTest : public ValidationTest {

2
src/tests/unittests/validation/QueueWriteTextureValidationTests.cpp
View File

@@ -16,7 +16,7 @@
#include "common/Math.h"
#include "utils/TestUtils.h"
#include "utils/TextureFormatUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
namespace {

12
src/tests/unittests/validation/StorageTextureValidationTests.cpp
View File

@@ -15,7 +15,7 @@
#include "common/Assert.h"
#include "tests/unittests/validation/ValidationTest.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TextureFormatUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
class StorageTextureValidationTests : public ValidationTest {
@@ -718,13 +718,9 @@ TEST_F(StorageTextureValidationTests, StorageTextureViewDimensionInBindGroup) {
for (wgpu::TextureViewDimension dimensionOfTextureView : kSupportedDimensions) {
// Create a texture view with given texture view dimension.
wgpu::TextureDimension dimension = wgpu::TextureDimension::e2D;
if (dimensionOfTextureView == wgpu::TextureViewDimension::e3D) {
dimension = wgpu::TextureDimension::e3D;
}
wgpu::Texture texture =
CreateTexture(wgpu::TextureUsage::Storage, kStorageTextureFormat, 1,
kDepthOrArrayLayers, dimension);
wgpu::Texture texture = CreateTexture(
wgpu::TextureUsage::Storage, kStorageTextureFormat, 1, kDepthOrArrayLayers,
utils::ViewDimensionToTextureDimension(dimensionOfTextureView));
wgpu::TextureViewDescriptor textureViewDescriptor = kDefaultTextureViewDescriptor;
textureViewDescriptor.dimension = dimensionOfTextureView;

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

@@ -16,7 +16,7 @@
#include "common/Constants.h"
#include "utils/ComboRenderPipelineDescriptor.h"
#include "utils/TextureFormatUtils.h"
#include "utils/TextureUtils.h"
#include "utils/WGPUHelpers.h"
namespace {