mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-18 17:35:30 +00:00
Fixup build/include_order issues in src/dawn.
This Cl moves the cpp includes to above the project includes fixing up the build/include_order issues and enabling the lint check. A couple includes are marked as NOLINT as the c header has to come after the project header due to setting defines. Bug: dawn:1339 Change-Id: Ia47499c94fff99106397b83f6c5c7fe100c44a0e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86513 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
This commit is contained in:
committed by
Dawn LUCI CQ
parent
ebdb70b81d
commit
b02535557e
@@ -14,14 +14,14 @@
|
||||
|
||||
#include "dawn/native/opengl/BackendGL.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "dawn/common/GPUInfo.h"
|
||||
#include "dawn/common/Log.h"
|
||||
#include "dawn/native/Instance.h"
|
||||
#include "dawn/native/OpenGLBackend.h"
|
||||
#include "dawn/native/opengl/DeviceGL.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
namespace dawn::native::opengl {
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
#include "dawn/native/opengl/CommandBufferGL.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "dawn/native/BindGroup.h"
|
||||
#include "dawn/native/BindGroupTracker.h"
|
||||
#include "dawn/native/CommandEncoder.h"
|
||||
@@ -32,8 +34,6 @@
|
||||
#include "dawn/native/opengl/TextureGL.h"
|
||||
#include "dawn/native/opengl/UtilsGL.h"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
namespace dawn::native::opengl {
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
#ifndef SRC_DAWN_NATIVE_OPENGL_DEVICEGL_H_
|
||||
#define SRC_DAWN_NATIVE_OPENGL_DEVICEGL_H_
|
||||
|
||||
#include <queue>
|
||||
|
||||
#include "dawn/native/dawn_platform.h"
|
||||
|
||||
#include "dawn/common/Platform.h"
|
||||
@@ -24,8 +26,6 @@
|
||||
#include "dawn/native/opengl/GLFormat.h"
|
||||
#include "dawn/native/opengl/OpenGLFunctions.h"
|
||||
|
||||
#include <queue>
|
||||
|
||||
// Remove windows.h macros after glad's include of windows.h
|
||||
#if defined(DAWN_PLATFORM_WINDOWS)
|
||||
# include "dawn/common/windows_with_undefs.h"
|
||||
|
||||
@@ -14,6 +14,9 @@
|
||||
|
||||
#include "dawn/native/opengl/PipelineGL.h"
|
||||
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
|
||||
#include "dawn/common/BitSetIterator.h"
|
||||
#include "dawn/native/BindGroupLayout.h"
|
||||
#include "dawn/native/Device.h"
|
||||
@@ -24,9 +27,6 @@
|
||||
#include "dawn/native/opengl/SamplerGL.h"
|
||||
#include "dawn/native/opengl/ShaderModuleGL.h"
|
||||
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
|
||||
namespace dawn::native::opengl {
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
#ifndef SRC_DAWN_NATIVE_OPENGL_PIPELINEGL_H_
|
||||
#define SRC_DAWN_NATIVE_OPENGL_PIPELINEGL_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "dawn/native/Pipeline.h"
|
||||
|
||||
#include "dawn/native/PerStage.h"
|
||||
#include "dawn/native/opengl/opengl_platform.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace dawn::native {
|
||||
struct ProgrammableStage;
|
||||
} // namespace dawn::native
|
||||
|
||||
@@ -15,13 +15,13 @@
|
||||
#ifndef SRC_DAWN_NATIVE_OPENGL_RENDERPIPELINEGL_H_
|
||||
#define SRC_DAWN_NATIVE_OPENGL_RENDERPIPELINEGL_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "dawn/native/RenderPipeline.h"
|
||||
|
||||
#include "dawn/native/opengl/PipelineGL.h"
|
||||
#include "dawn/native/opengl/opengl_platform.h"
|
||||
|
||||
#include <vector>
|
||||
|
||||
namespace dawn::native::opengl {
|
||||
|
||||
class Device;
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
|
||||
#include "dawn/native/opengl/ShaderModuleGL.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "dawn/native/BindGroupLayout.h"
|
||||
#include "dawn/native/TintUtils.h"
|
||||
#include "dawn/native/opengl/DeviceGL.h"
|
||||
@@ -21,9 +23,7 @@
|
||||
#include "dawn/platform/DawnPlatform.h"
|
||||
#include "dawn/platform/tracing/TraceEvent.h"
|
||||
|
||||
#include <tint/tint.h>
|
||||
|
||||
#include <sstream>
|
||||
#include "tint/tint.h"
|
||||
|
||||
namespace dawn::native::opengl {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user