Mesa (main): dzn: remove needless defines

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Apr 19 16:29:46 UTC 2022


Module: Mesa
Branch: main
Commit: cfdaf1af9b306d718caa009bb865ae42210df541
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfdaf1af9b306d718caa009bb865ae42210df541

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Apr  8 10:41:24 2022 +0200

dzn: remove needless defines

Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15816>

---

 src/microsoft/vulkan/dzn_device.c  | 2 --
 src/microsoft/vulkan/dzn_nir.h     | 2 --
 src/microsoft/vulkan/dzn_private.h | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index 480ae263f82..81e4a3639c2 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -44,9 +44,7 @@
 
 #include <windows.h>
 
-#define CINTERFACE
 #include <directx/d3d12sdklayers.h>
-#undef CINTERFACE
 
 #if defined(VK_USE_PLATFORM_WIN32_KHR) || \
     defined(VK_USE_PLATFORM_DISPLAY_KHR)
diff --git a/src/microsoft/vulkan/dzn_nir.h b/src/microsoft/vulkan/dzn_nir.h
index a8ac15463d5..5eaec3ecc7c 100644
--- a/src/microsoft/vulkan/dzn_nir.h
+++ b/src/microsoft/vulkan/dzn_nir.h
@@ -25,10 +25,8 @@
 #define DZN_NIR_H
 
 #define D3D12_IGNORE_SDK_LAYERS
-#define CINTERFACE
 #define COBJMACROS
 #include <directx/d3d12.h>
-#undef CINTERFACE
 
 #include "nir.h"
 
diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h
index d310b0ca871..c64143699f4 100644
--- a/src/microsoft/vulkan/dzn_private.h
+++ b/src/microsoft/vulkan/dzn_private.h
@@ -52,11 +52,9 @@
 #include <vulkan/vk_icd.h>
 
 #define D3D12_IGNORE_SDK_LAYERS
-#define CINTERFACE
 #define COBJMACROS
 #include <dxgi1_4.h>
 #include <directx/d3d12.h>
-#undef CINTERFACE
 
 #include "spirv_to_dxil.h"
 



More information about the mesa-commit mailing list