From 13d88a6438321e11aae1bfab8fc8fe00d10b5f07 Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Mon, 11 Apr 2022 14:01:50 +0000 Subject: [PATCH] Fixup build/include issues in src/dawn This CL fixes up a few include issues in the dawn folder allowing the build/include lint rule to be enabled. Bug: dawn:1339 Change-Id: I585c0b6a7e9c1f8bff466ea8c3765e2a1486e79c Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86240 Reviewed-by: Corentin Wallez Reviewed-by: Ben Clayton Commit-Queue: Dan Sinclair Auto-Submit: Dan Sinclair --- src/dawn/CPPLINT.cfg | 1 - src/dawn/fuzzers/DawnWireServerFuzzer.cpp | 2 +- src/dawn/node/binding/GPURenderBundle.cpp | 1 - src/dawn/tests/end2end/AdapterDiscoveryTests.cpp | 4 ---- src/dawn/tests/end2end/VideoViewsTests.cpp | 2 +- src/dawn/tests/unittests/native/mocks/ShaderModuleMock.cpp | 2 +- src/dawn/utils/SystemUtils.cpp | 2 ++ src/dawn/utils/TextureUtils.cpp | 2 +- 8 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/dawn/CPPLINT.cfg b/src/dawn/CPPLINT.cfg index 079d6ee1c3..7b240de37c 100644 --- a/src/dawn/CPPLINT.cfg +++ b/src/dawn/CPPLINT.cfg @@ -1,5 +1,4 @@ filter=-build/header_guard -filter=-build/include filter=-build/include_directory filter=-build/include_order filter=-build/include_what_you_use diff --git a/src/dawn/fuzzers/DawnWireServerFuzzer.cpp b/src/dawn/fuzzers/DawnWireServerFuzzer.cpp index bf35518697..17b5d23482 100644 --- a/src/dawn/fuzzers/DawnWireServerFuzzer.cpp +++ b/src/dawn/fuzzers/DawnWireServerFuzzer.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "DawnWireServerFuzzer.h" +#include "dawn/fuzzers/DawnWireServerFuzzer.h" #include "dawn/common/Assert.h" #include "dawn/common/Log.h" diff --git a/src/dawn/node/binding/GPURenderBundle.cpp b/src/dawn/node/binding/GPURenderBundle.cpp index b741817086..e2c786ee19 100644 --- a/src/dawn/node/binding/GPURenderBundle.cpp +++ b/src/dawn/node/binding/GPURenderBundle.cpp @@ -16,7 +16,6 @@ #include "src/dawn/node/binding/Converter.h" #include "src/dawn/node/binding/GPUBuffer.h" -#include "src/dawn/node/binding/GPURenderBundle.h" #include "src/dawn/node/binding/GPURenderPipeline.h" #include "src/dawn/node/utils/Debug.h" diff --git a/src/dawn/tests/end2end/AdapterDiscoveryTests.cpp b/src/dawn/tests/end2end/AdapterDiscoveryTests.cpp index 62295fc3ea..bfc2540c4e 100644 --- a/src/dawn/tests/end2end/AdapterDiscoveryTests.cpp +++ b/src/dawn/tests/end2end/AdapterDiscoveryTests.cpp @@ -33,10 +33,6 @@ # include "dawn/native/MetalBackend.h" #endif // defined(DAWN_ENABLE_BACKEND_METAL) -#if defined(DAWN_ENABLE_BACKEND_METAL) -# include "dawn/native/MetalBackend.h" -#endif // defined(DAWN_ENABLE_BACKEND_METAL) - #if defined(DAWN_ENABLE_BACKEND_DESKTOP_GL) || defined(DAWN_ENABLE_BACKEND_OPENGLES) # include "GLFW/glfw3.h" # include "dawn/native/OpenGLBackend.h" diff --git a/src/dawn/tests/end2end/VideoViewsTests.cpp b/src/dawn/tests/end2end/VideoViewsTests.cpp index a037f0ac9f..c03ee6f1ff 100644 --- a/src/dawn/tests/end2end/VideoViewsTests.cpp +++ b/src/dawn/tests/end2end/VideoViewsTests.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "VideoViewsTests.h" +#include "dawn/tests/end2end/VideoViewsTests.h" #include "dawn/utils/ComboRenderPipelineDescriptor.h" #include "dawn/utils/WGPUHelpers.h" diff --git a/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.cpp b/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.cpp index 4c7da22f09..710737c4b7 100644 --- a/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.cpp +++ b/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "ShaderModuleMock.h" +#include "dawn/tests/unittests/native/mocks/ShaderModuleMock.h" namespace dawn::native { diff --git a/src/dawn/utils/SystemUtils.cpp b/src/dawn/utils/SystemUtils.cpp index 9010e2b20d..221fb71112 100644 --- a/src/dawn/utils/SystemUtils.cpp +++ b/src/dawn/utils/SystemUtils.cpp @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "dawn/utils/SystemUtils.h" + #include "dawn/common/Platform.h" #if defined(DAWN_PLATFORM_WINDOWS) diff --git a/src/dawn/utils/TextureUtils.cpp b/src/dawn/utils/TextureUtils.cpp index 312c1dbdae..ce5de07a0a 100644 --- a/src/dawn/utils/TextureUtils.cpp +++ b/src/dawn/utils/TextureUtils.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "TextureUtils.h" +#include "dawn/utils/TextureUtils.h" namespace utils { bool TextureFormatSupportsStorageTexture(wgpu::TextureFormat format) {