commit a50d9ba592fb030943387f315b74ed6250be9835
author Corentin Wallez <cwallez@chromium.org> Thu Sep 19 14:31:46 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 19 14:31:46 2024 +0000
tree c79242d2fb39d76c20583f7cd49a569ee999744b
parent 1bc66ae3d97b73fe13f01bf045ac98946887cb65

dawn: Remove direct includes of windows.h

Make them use windows_with_undefs.h instead, except D3DBackend.h which
is part of the public API and cannot depend on Dawn internals.

Change-Id: I543f2dc6041b7bc1490ae6bb3f0e9ca76855c6ed
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/207234
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

include/dawn/native/D3D11Backend.h

diff --git a/include/dawn/native/D3D11Backend.h b/include/dawn/native/D3D11Backend.h
index cfcfb27..e8fedd4 100644
--- a/include/dawn/native/D3D11Backend.h
+++ b/include/dawn/native/D3D11Backend.h
@@ -29,7 +29,6 @@
 #define INCLUDE_DAWN_NATIVE_D3D11BACKEND_H_
 
 #include <d3d11_1.h>
-#include <windows.h>
 #include <wrl/client.h>
 
 #include <memory>

include/dawn/native/D3D12Backend.h

diff --git a/include/dawn/native/D3D12Backend.h b/include/dawn/native/D3D12Backend.h
index 31faf6c..2af31b7 100644
--- a/include/dawn/native/D3D12Backend.h
+++ b/include/dawn/native/D3D12Backend.h
@@ -30,7 +30,6 @@
 
 #include <d3d12.h>
 #include <dxgi1_4.h>
-#include <windows.h>
 #include <wrl/client.h>
 
 #include "dawn/native/D3DBackend.h"

include/dawn/native/D3DBackend.h

diff --git a/include/dawn/native/D3DBackend.h b/include/dawn/native/D3DBackend.h
index 52f86e6..1fad332 100644
--- a/include/dawn/native/D3DBackend.h
+++ b/include/dawn/native/D3DBackend.h
@@ -52,7 +52,7 @@
 };
 
 // Chrome uses 0 as acquire key.
-static constexpr UINT64 kDXGIKeyedMutexAcquireKey = 0;
+static constexpr uint64_t kDXGIKeyedMutexAcquireKey = 0;
 
 }  // namespace dawn::native::d3d
 

src/dawn/common/SystemUtils.cpp

diff --git a/src/dawn/common/SystemUtils.cpp b/src/dawn/common/SystemUtils.cpp
index 73eb4fc..9e1389d 100644
--- a/src/dawn/common/SystemUtils.cpp
+++ b/src/dawn/common/SystemUtils.cpp
@@ -31,8 +31,8 @@
 #include "dawn/common/Log.h"
 
 #if DAWN_PLATFORM_IS(WINDOWS)
-#include <Windows.h>
 #include <vector>
+#include "dawn/common/windows_with_undefs.h"
 #elif DAWN_PLATFORM_IS(LINUX)
 #include <dlfcn.h>
 #include <limits.h>

src/dawn/native/Surface.cpp

diff --git a/src/dawn/native/Surface.cpp b/src/dawn/native/Surface.cpp
index 1972d6c..2a59b22 100644
--- a/src/dawn/native/Surface.cpp
+++ b/src/dawn/native/Surface.cpp
@@ -40,7 +40,7 @@
 #include "dawn/native/utils/WGPUHelpers.h"
 
 #if DAWN_PLATFORM_IS(WINDOWS)
-#include <Windows.h>
+#include "dawn/common/windows_with_undefs.h"
 #endif  // DAWN_PLATFORM_IS(WINDOWS)
 
 #if defined(DAWN_USE_WINDOWS_UI)

src/dawn/utils/SystemUtils.cpp

diff --git a/src/dawn/utils/SystemUtils.cpp b/src/dawn/utils/SystemUtils.cpp
index 5864670..ac19c96 100644
--- a/src/dawn/utils/SystemUtils.cpp
+++ b/src/dawn/utils/SystemUtils.cpp
@@ -30,7 +30,7 @@
 #include "dawn/common/Platform.h"
 
 #if DAWN_PLATFORM_IS(WINDOWS)
-#include <Windows.h>
+#include "dawn/common/windows_with_undefs.h"
 #elif DAWN_PLATFORM_IS(POSIX)
 #include <unistd.h>
 #else