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

Remove depth sampling tests of non-normalized depth values 

Depth texture values outside the 0-1 range are not supported without
an extension.

Bug: dawn:413, dawn:367
Change-Id: I75e7f0de054d6f9a4bac7c6b955c65db810fe36e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/24681
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2020-07-17 15:18:57 +00:00 committed by Commit Bot service account
parent e01dd678d3
commit 64dd82e94f
1 changed files with 10 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/tests/end2end/DepthSamplingTests.cpp
View File

@ -31,7 +31,6 @@ namespace {
// Test 0, below the ref, equal to, above the ref, and 1. // Test 0, below the ref, equal to, above the ref, and 1.
const std::vector<float> kNormalizedTextureValues = {0.0, 0.3, 0.4, 0.5, 1.0}; const std::vector<float> kNormalizedTextureValues = {0.0, 0.3, 0.4, 0.5, 1.0};
const std::vector<float> kNonNormalizedTextureValues = {-0.2, -0.1, 1.2, 1.3};
} // anonymous namespace } // anonymous namespace
@ -51,8 +50,7 @@ class DepthSamplingTest : public DawnTest {
mTextureUploadBuffer = device.CreateBuffer(&textureUploadDesc); mTextureUploadBuffer = device.CreateBuffer(&textureUploadDesc);
wgpu::TextureDescriptor inputTextureDesc; wgpu::TextureDescriptor inputTextureDesc;
inputTextureDesc.usage = wgpu::TextureUsage::CopyDst | wgpu::TextureUsage::Sampled | inputTextureDesc.usage = wgpu::TextureUsage::Sampled | wgpu::TextureUsage::OutputAttachment;
wgpu::TextureUsage::OutputAttachment;
inputTextureDesc.size = {1, 1, 1}; inputTextureDesc.size = {1, 1, 1};
inputTextureDesc.format = wgpu::TextureFormat::Depth32Float; inputTextureDesc.format = wgpu::TextureFormat::Depth32Float;
mInputTexture = device.CreateTexture(&inputTextureDesc); mInputTexture = device.CreateTexture(&inputTextureDesc);
@ -201,20 +199,11 @@ class DepthSamplingTest : public DawnTest {
} }
void UpdateInputTexture(wgpu::CommandEncoder commandEncoder, float textureValue) { void UpdateInputTexture(wgpu::CommandEncoder commandEncoder, float textureValue) {
queue.WriteBuffer(mTextureUploadBuffer, 0, &textureValue, sizeof(float)); utils::ComboRenderPassDescriptor passDescriptor({}, mInputTexture.CreateView());
passDescriptor.cDepthStencilAttachmentInfo.clearDepth = textureValue;
wgpu::BufferCopyView bufferCopyView = {}; wgpu::RenderPassEncoder pass = commandEncoder.BeginRenderPass(&passDescriptor);
bufferCopyView.buffer = mTextureUploadBuffer; pass.EndPass();
bufferCopyView.offset = 0;
bufferCopyView.bytesPerRow = kTextureBytesPerRowAlignment;
wgpu::TextureCopyView textureCopyView;
textureCopyView.texture = mInputTexture;
textureCopyView.origin = {0, 0, 0};
wgpu::Extent3D copySize = {1, 1, 1};
commandEncoder.CopyBufferToTexture(&bufferCopyView, &textureCopyView, &copySize);
} }
void DoSamplingTest(wgpu::RenderPipeline pipeline, std::vector<float> textureValues) { void DoSamplingTest(wgpu::RenderPipeline pipeline, std::vector<float> textureValues) {
@ -339,7 +328,7 @@ class DepthSamplingTest : public DawnTest {
queue.Submit(1, &commands); queue.Submit(1, &commands);
EXPECT_PIXEL_FLOAT_EQ( EXPECT_PIXEL_FLOAT_EQ(
CompareFunctionPasses(compareRef, compare, textureValue) ? 1.0 : 0.0, CompareFunctionPasses(compareRef, compare, textureValue) ? 1.f : 0.f,
mOutputTexture, 0, 0); mOutputTexture, 0, 0);
} }
} }
@ -406,30 +395,11 @@ TEST_P(DepthSamplingTest, SampleCompute) {
DoSamplingTest(CreateSamplingComputePipeline(), kNormalizedTextureValues); DoSamplingTest(CreateSamplingComputePipeline(), kNormalizedTextureValues);
} }
// Test that sampling a depth texture with a render pipeline works,
// when the texture contents are outside the 0-1 range.
TEST_P(DepthSamplingTest, SampleNonNormalizedContentsRender) {
// TODO(enga): Sampling depth textures is clamped. Unless we reinterpret
// contents as R32F.
DAWN_SKIP_TEST_IF(IsOpenGL());
// Test values not between [0, 1]
DoSamplingTest(CreateSamplingRenderPipeline(), kNonNormalizedTextureValues);
}
// Test that sampling a depth texture with a render pipeline works,
// when the texture contents are outside the 0-1 range.
TEST_P(DepthSamplingTest, SampleNonNormalizedContentsCompute) {
// TODO(enga): Sampling depth textures is clamped. Unless we reinterpret
// contents as R32F.
DAWN_SKIP_TEST_IF(IsOpenGL());
// Test values not between [0, 1]
DoSamplingTest(CreateSamplingComputePipeline(), kNonNormalizedTextureValues);
}
// Test that sampling in a render pipeline with all of the compare functions works. // Test that sampling in a render pipeline with all of the compare functions works.
TEST_P(DepthSamplingTest, CompareFunctionsRender) { TEST_P(DepthSamplingTest, CompareFunctionsRender) {
// Initialization via renderPass loadOp doesn't work on Mac Intel.
DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
wgpu::RenderPipeline pipeline = CreateComparisonRenderPipeline(); wgpu::RenderPipeline pipeline = CreateComparisonRenderPipeline();
// Test a "normal" ref value between 0 and 1; as well as negative and > 1 refs. // Test a "normal" ref value between 0 and 1; as well as negative and > 1 refs.
@ -443,7 +413,7 @@ TEST_P(DepthSamplingTest, CompareFunctionsRender) {
// Test that sampling in a render pipeline with all of the compare functions works. // Test that sampling in a render pipeline with all of the compare functions works.
TEST_P(DepthSamplingTest, CompareFunctionsCompute) { TEST_P(DepthSamplingTest, CompareFunctionsCompute) {
// Comparison is always 0 on Mac Intel when using compute. // Initialization via renderPass loadOp doesn't work on Mac Intel.
DAWN_SKIP_TEST_IF(IsMetal() && IsIntel()); DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
wgpu::ComputePipeline pipeline = CreateComparisonComputePipeline(); wgpu::ComputePipeline pipeline = CreateComparisonComputePipeline();
@ -457,43 +427,6 @@ TEST_P(DepthSamplingTest, CompareFunctionsCompute) {
} }
} }
// Test that sampling in a render pipeline with all of the compare functions works,
// when the texture contents are outside the 0-1 range.
TEST_P(DepthSamplingTest, CompareFunctionsNonNormalizedContentsRender) {
// TODO(enga): Sampling depth textures is clamped. Unless we reinterpret
// contents as R32F.
DAWN_SKIP_TEST_IF(IsOpenGL());
wgpu::RenderPipeline pipeline = CreateComparisonRenderPipeline();
// Test a "normal" ref value between 0 and 1; as well as negative and > 1 refs.
for (float compareRef : kCompareRefs) {
// Test negative, and above 1.
for (wgpu::CompareFunction f : kCompareFunctions) {
DoCompareRefTest(pipeline, compareRef, f, kNonNormalizedTextureValues);
}
}
}
// Test that sampling in a compute pipeline with all of the compare functions works,
// when the texture contents are outside the 0-1 range.
TEST_P(DepthSamplingTest, CompareFunctionsNonNormalizedContentsCompute) {
// Comparison is always 0 on Mac Intel when using compute.
DAWN_SKIP_TEST_IF(IsMetal() && IsIntel());
// TODO(enga): Sampling depth textures is clamped. Unless we reinterpret
// contents as R32F.
DAWN_SKIP_TEST_IF(IsOpenGL());
wgpu::ComputePipeline pipeline = CreateComparisonComputePipeline();
// Test a "normal" ref value between 0 and 1; as well as negative and > 1 refs.
for (float compareRef : kCompareRefs) {
// Test negative, and above 1.
for (wgpu::CompareFunction f : kCompareFunctions) {
DoCompareRefTest(pipeline, compareRef, f, kNormalizedTextureValues);
}
}
}
DAWN_INSTANTIATE_TEST(DepthSamplingTest, DAWN_INSTANTIATE_TEST(DepthSamplingTest,
D3D12Backend(), D3D12Backend(),
MetalBackend(), MetalBackend(),