commit 1aff02d444786a451f72a9b3bb5d064f0b26e0f4
author Corentin Wallez <cwallez@chromium.org> Wed Aug 12 08:43:24 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Wed Aug 12 08:43:24 2020 +0000
tree 487cacc80b84b8fb02194cb3f194199b8bde7ba8
parent 37f547456cc61ba30bb27a60a18cbbdf1cd0d7e5

Small nits for the implementation of WriteTexture in D3D12

Bug: None

Change-Id: Id44ff878ac3fc9762008a7f8b95ee65072aa1fcd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/26600
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn_native/d3d12/QueueD3D12.cpp

diff --git a/src/dawn_native/d3d12/QueueD3D12.cpp b/src/dawn_native/d3d12/QueueD3D12.cpp
index c7c0978..9969dbc 100644
--- a/src/dawn_native/d3d12/QueueD3D12.cpp
+++ b/src/dawn_native/d3d12/QueueD3D12.cpp
@@ -15,7 +15,6 @@
 #include "dawn_native/d3d12/QueueD3D12.h"
 
 #include "common/Math.h"
-#include "dawn_native/Buffer.h"
 #include "dawn_native/CommandValidation.h"
 #include "dawn_native/Commands.h"
 #include "dawn_native/DynamicUploader.h"

src/tests/end2end/CompressedTextureFormatTests.cpp

diff --git a/src/tests/end2end/CompressedTextureFormatTests.cpp b/src/tests/end2end/CompressedTextureFormatTests.cpp
index a6ae419..2fe87ed 100644
--- a/src/tests/end2end/CompressedTextureFormatTests.cpp
+++ b/src/tests/end2end/CompressedTextureFormatTests.cpp
@@ -1180,6 +1180,6 @@
 }
 
 DAWN_INSTANTIATE_TEST(CompressedTextureWriteTextureTest,
+                      D3D12Backend(),
                       MetalBackend(),
-                      VulkanBackend(),
-                      D3D12Backend());
\ No newline at end of file
+                      VulkanBackend());

src/tests/end2end/QueueTests.cpp

diff --git a/src/tests/end2end/QueueTests.cpp b/src/tests/end2end/QueueTests.cpp
index 2ac7c8c..21876b6 100644
--- a/src/tests/end2end/QueueTests.cpp
+++ b/src/tests/end2end/QueueTests.cpp
@@ -522,4 +522,4 @@
     }
 }
 
-DAWN_INSTANTIATE_TEST(QueueWriteTextureTests, MetalBackend(), VulkanBackend(), D3D12Backend());
+DAWN_INSTANTIATE_TEST(QueueWriteTextureTests, D3D12Backend(), MetalBackend(), VulkanBackend());