dzn: Define COBJMACROS before any includes
authorJesse Natalie <jenatali@microsoft.com>
Fri, 1 Jul 2022 16:28:52 +0000 (09:28 -0700)
committerMarge Bot <emma+marge@anholt.net>
Wed, 6 Jul 2022 12:18:55 +0000 (12:18 +0000)
Otherwise the IUnknown definition might get included before it.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17340>

src/microsoft/vulkan/dzn_private.h

index 4c063ec..b098b6a 100644 (file)
@@ -24,6 +24,8 @@
 #ifndef DZN_PRIVATE_H
 #define DZN_PRIVATE_H
 
+#define COBJMACROS
+
 #include "vk_command_pool.h"
 #include "vk_command_buffer.h"
 #include "vk_cmd_queue.h"
@@ -56,7 +58,6 @@
 #include <vulkan/vk_icd.h>
 
 #define D3D12_IGNORE_SDK_LAYERS
-#define COBJMACROS
 #include <unknwn.h>
 #include <dxgi1_4.h>
 #include <directx/d3d12.h>