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

Newline fixes and tiny cleanups for lazy-0-init

Browse Source 
BUG=

Change-Id: I1165b0d75b4e2796ff89ffabb2401c474955ee2a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8440
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Natasha Lee <natlee@microsoft.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez 2019-07-01 09:58:36 +00:00 committed by Commit Bot service account
parent 431d618961
commit 773a551d1a
3 changed files with 517 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dawn_native/vulkan/CommandBufferVk.cpp
View File

@ -175,7 +175,7 @@ namespace dawn_native { namespace vulkan {
dawn::LoadOp loadOp = attachmentInfo.loadOp; dawn::LoadOp loadOp = attachmentInfo.loadOp;
ASSERT(view->GetLayerCount() == 1); ASSERT(view->GetLayerCount() == 1);
ASSERT(view->GetLevelCount() == 1); ASSERT(view->GetLevelCount() == 1);
if (loadOp == dawn::LoadOp::Load && view->GetTexture() && if (loadOp == dawn::LoadOp::Load &&
!view->GetTexture()->IsSubresourceContentInitialized( !view->GetTexture()->IsSubresourceContentInitialized(
view->GetBaseMipLevel(), 1, view->GetBaseArrayLayer(), 1)) { view->GetBaseMipLevel(), 1, view->GetBaseArrayLayer(), 1)) {
loadOp = dawn::LoadOp::Clear; loadOp = dawn::LoadOp::Clear;

30
src/tests/end2end/TextureZeroInitTests.cpp
View File

@ -53,16 +53,16 @@ class TextureZeroInitTest : public DawnTest {
utils::ComboRenderPipelineDescriptor pipelineDescriptor(device); utils::ComboRenderPipelineDescriptor pipelineDescriptor(device);
const char* vs = const char* vs =
R"(#version 450 R"(#version 450
const vec3 pos[6] = vec3[6](vec3(-1.0f, -1.0f, 0.0f), const vec2 pos[6] = vec2[6](vec2(-1.0f, -1.0f),
vec3(-1.0f, 1.0f, 0.0f), vec2(-1.0f, 1.0f),
vec3( 1.0f, -1.0f, 0.0f), vec2( 1.0f, -1.0f),
vec3( 1.0f, 1.0f, 0.0f), vec2( 1.0f, 1.0f),
vec3(-1.0f, 1.0f, 0.0f), vec2(-1.0f, 1.0f),
vec3( 1.0f, -1.0f, 0.0f) vec2( 1.0f, -1.0f)
); );
void main() { void main() {
gl_Position = vec4(pos[gl_VertexIndex], 1.0); gl_Position = vec4(pos[gl_VertexIndex], 0.0, 1.0);
})"; })";
pipelineDescriptor.cVertexStage.module = pipelineDescriptor.cVertexStage.module =
utils::CreateShaderModule(device, dawn::ShaderStage::Vertex, vs); utils::CreateShaderModule(device, dawn::ShaderStage::Vertex, vs);
@ -89,7 +89,7 @@ class TextureZeroInitTest : public DawnTest {
}; };
// This tests that the code path of CopyTextureToBuffer clears correctly to Zero after first usage // This tests that the code path of CopyTextureToBuffer clears correctly to Zero after first usage
TEST_P(TextureZeroInitTest, RecycleTextureMemoryClear) { TEST_P(TextureZeroInitTest, CopyTextureToBufferSource) {
dawn::TextureDescriptor descriptor = CreateTextureDescriptor( dawn::TextureDescriptor descriptor = CreateTextureDescriptor(
1, 1, dawn::TextureUsageBit::OutputAttachment | dawn::TextureUsageBit::TransferSrc, 1, 1, dawn::TextureUsageBit::OutputAttachment | dawn::TextureUsageBit::TransferSrc,
kColorFormat); kColorFormat);
@ -102,7 +102,7 @@ TEST_P(TextureZeroInitTest, RecycleTextureMemoryClear) {
// Test that non-zero mip level clears subresource to Zero after first use // Test that non-zero mip level clears subresource to Zero after first use
// This goes through the BeginRenderPass's code path // This goes through the BeginRenderPass's code path
TEST_P(TextureZeroInitTest, MipMapClearsToZero) { TEST_P(TextureZeroInitTest, RenderingMipMapClearsToZero) {
dawn::TextureDescriptor descriptor = CreateTextureDescriptor( dawn::TextureDescriptor descriptor = CreateTextureDescriptor(
4, 1, dawn::TextureUsageBit::OutputAttachment | dawn::TextureUsageBit::TransferSrc, 4, 1, dawn::TextureUsageBit::OutputAttachment | dawn::TextureUsageBit::TransferSrc,
kColorFormat); kColorFormat);
@ -131,7 +131,7 @@ TEST_P(TextureZeroInitTest, MipMapClearsToZero) {
// Test that non-zero array layers clears subresource to Zero after first use. // Test that non-zero array layers clears subresource to Zero after first use.
// This goes through the BeginRenderPass's code path // This goes through the BeginRenderPass's code path
TEST_P(TextureZeroInitTest, ArrayLayerClearsToZero) { TEST_P(TextureZeroInitTest, RenderingArrayLayerClearsToZero) {
dawn::TextureDescriptor descriptor = CreateTextureDescriptor( dawn::TextureDescriptor descriptor = CreateTextureDescriptor(
1, 4, dawn::TextureUsageBit::OutputAttachment | dawn::TextureUsageBit::TransferSrc, 1, 4, dawn::TextureUsageBit::OutputAttachment | dawn::TextureUsageBit::TransferSrc,
kColorFormat); kColorFormat);
@ -170,9 +170,11 @@ TEST_P(TextureZeroInitTest, CopyBufferToTexture) {
std::vector<uint8_t> data(4 * kSize * kSize, 100); std::vector<uint8_t> data(4 * kSize * kSize, 100);
dawn::Buffer stagingBuffer = utils::CreateBufferFromData( dawn::Buffer stagingBuffer = utils::CreateBufferFromData(
device, data.data(), static_cast<uint32_t>(data.size()), dawn::BufferUsageBit::TransferSrc); device, data.data(), static_cast<uint32_t>(data.size()), dawn::BufferUsageBit::TransferSrc);
dawn::BufferCopyView bufferCopyView = utils::CreateBufferCopyView(stagingBuffer, 0, 0, 0); dawn::BufferCopyView bufferCopyView = utils::CreateBufferCopyView(stagingBuffer, 0, 0, 0);
dawn::TextureCopyView textureCopyView = utils::CreateTextureCopyView(texture, 0, 0, {0, 0, 0}); dawn::TextureCopyView textureCopyView = utils::CreateTextureCopyView(texture, 0, 0, {0, 0, 0});
dawn::Extent3D copySize = {kSize, kSize, 1}; dawn::Extent3D copySize = {kSize, kSize, 1};
dawn::CommandEncoder encoder = device.CreateCommandEncoder(); dawn::CommandEncoder encoder = device.CreateCommandEncoder();
encoder.CopyBufferToTexture(&bufferCopyView, &textureCopyView, &copySize); encoder.CopyBufferToTexture(&bufferCopyView, &textureCopyView, &copySize);
dawn::CommandBuffer commands = encoder.Finish(); dawn::CommandBuffer commands = encoder.Finish();
@ -196,9 +198,11 @@ TEST_P(TextureZeroInitTest, CopyBufferToTextureHalf) {
std::vector<uint8_t> data(4 * kSize * kSize, 100); std::vector<uint8_t> data(4 * kSize * kSize, 100);
dawn::Buffer stagingBuffer = utils::CreateBufferFromData( dawn::Buffer stagingBuffer = utils::CreateBufferFromData(
device, data.data(), static_cast<uint32_t>(data.size()), dawn::BufferUsageBit::TransferSrc); device, data.data(), static_cast<uint32_t>(data.size()), dawn::BufferUsageBit::TransferSrc);
dawn::BufferCopyView bufferCopyView = utils::CreateBufferCopyView(stagingBuffer, 0, 0, 0); dawn::BufferCopyView bufferCopyView = utils::CreateBufferCopyView(stagingBuffer, 0, 0, 0);
dawn::TextureCopyView textureCopyView = utils::CreateTextureCopyView(texture, 0, 0, {0, 0, 0}); dawn::TextureCopyView textureCopyView = utils::CreateTextureCopyView(texture, 0, 0, {0, 0, 0});
dawn::Extent3D copySize = {kSize / 2, kSize, 1}; dawn::Extent3D copySize = {kSize / 2, kSize, 1};
dawn::CommandEncoder encoder = device.CreateCommandEncoder(); dawn::CommandEncoder encoder = device.CreateCommandEncoder();
encoder.CopyBufferToTexture(&bufferCopyView, &textureCopyView, &copySize); encoder.CopyBufferToTexture(&bufferCopyView, &textureCopyView, &copySize);
dawn::CommandBuffer commands = encoder.Finish(); dawn::CommandBuffer commands = encoder.Finish();
@ -300,7 +304,7 @@ TEST_P(TextureZeroInitTest, CopyTextureToTextureHalf) {
// This tests the texture with depth attachment and load op load will init depth stencil texture to // This tests the texture with depth attachment and load op load will init depth stencil texture to
// 0s. // 0s.
TEST_P(TextureZeroInitTest, DepthClear) { TEST_P(TextureZeroInitTest, RenderingLoadingDepth) {
dawn::TextureDescriptor srcDescriptor = CreateTextureDescriptor( dawn::TextureDescriptor srcDescriptor = CreateTextureDescriptor(
1, 1, 1, 1,
dawn::TextureUsageBit::TransferSrc | dawn::TextureUsageBit::TransferDst | dawn::TextureUsageBit::TransferSrc | dawn::TextureUsageBit::TransferDst |
@ -334,7 +338,7 @@ TEST_P(TextureZeroInitTest, DepthClear) {
// This tests the texture with stencil attachment and load op load will init depth stencil texture // This tests the texture with stencil attachment and load op load will init depth stencil texture
// to 0s. // to 0s.
TEST_P(TextureZeroInitTest, StencilClear) { TEST_P(TextureZeroInitTest, RenderingLoadingStencil) {
dawn::TextureDescriptor srcDescriptor = CreateTextureDescriptor( dawn::TextureDescriptor srcDescriptor = CreateTextureDescriptor(
1, 1, 1, 1,
dawn::TextureUsageBit::TransferSrc | dawn::TextureUsageBit::TransferDst | dawn::TextureUsageBit::TransferSrc | dawn::TextureUsageBit::TransferDst |
@ -368,7 +372,7 @@ TEST_P(TextureZeroInitTest, StencilClear) {
// This tests the texture with depth stencil attachment and load op load will init depth stencil // This tests the texture with depth stencil attachment and load op load will init depth stencil
// texture to 0s. // texture to 0s.
TEST_P(TextureZeroInitTest, DepthStencilClear) { TEST_P(TextureZeroInitTest, RenderingLoadingDepthStencil) {
dawn::TextureDescriptor srcDescriptor = CreateTextureDescriptor( dawn::TextureDescriptor srcDescriptor = CreateTextureDescriptor(
1, 1, 1, 1,
dawn::TextureUsageBit::TransferSrc | dawn::TextureUsageBit::TransferDst | dawn::TextureUsageBit::TransferSrc | dawn::TextureUsageBit::TransferDst |