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 <cwallez@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
dan sinclair 2022-04-11 14:01:50 +00:00 committed by Dawn LUCI CQ
parent fcf56791c1
commit 13d88a6438
8 changed files with 6 additions and 10 deletions

View File

@ -1,5 +1,4 @@
filter=-build/header_guard filter=-build/header_guard
filter=-build/include
filter=-build/include_directory filter=-build/include_directory
filter=-build/include_order filter=-build/include_order
filter=-build/include_what_you_use filter=-build/include_what_you_use

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "DawnWireServerFuzzer.h" #include "dawn/fuzzers/DawnWireServerFuzzer.h"
#include "dawn/common/Assert.h" #include "dawn/common/Assert.h"
#include "dawn/common/Log.h" #include "dawn/common/Log.h"

View File

@ -16,7 +16,6 @@
#include "src/dawn/node/binding/Converter.h" #include "src/dawn/node/binding/Converter.h"
#include "src/dawn/node/binding/GPUBuffer.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/binding/GPURenderPipeline.h"
#include "src/dawn/node/utils/Debug.h" #include "src/dawn/node/utils/Debug.h"

View File

@ -33,10 +33,6 @@
# include "dawn/native/MetalBackend.h" # include "dawn/native/MetalBackend.h"
#endif // defined(DAWN_ENABLE_BACKEND_METAL) #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) #if defined(DAWN_ENABLE_BACKEND_DESKTOP_GL) || defined(DAWN_ENABLE_BACKEND_OPENGLES)
# include "GLFW/glfw3.h" # include "GLFW/glfw3.h"
# include "dawn/native/OpenGLBackend.h" # include "dawn/native/OpenGLBackend.h"

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "VideoViewsTests.h" #include "dawn/tests/end2end/VideoViewsTests.h"
#include "dawn/utils/ComboRenderPipelineDescriptor.h" #include "dawn/utils/ComboRenderPipelineDescriptor.h"
#include "dawn/utils/WGPUHelpers.h" #include "dawn/utils/WGPUHelpers.h"

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "ShaderModuleMock.h" #include "dawn/tests/unittests/native/mocks/ShaderModuleMock.h"
namespace dawn::native { namespace dawn::native {

View File

@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "dawn/utils/SystemUtils.h"
#include "dawn/common/Platform.h" #include "dawn/common/Platform.h"
#if defined(DAWN_PLATFORM_WINDOWS) #if defined(DAWN_PLATFORM_WINDOWS)

View File

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include "TextureUtils.h" #include "dawn/utils/TextureUtils.h"
namespace utils { namespace utils {
bool TextureFormatSupportsStorageTexture(wgpu::TextureFormat format) { bool TextureFormatSupportsStorageTexture(wgpu::TextureFormat format) {