wined3d: Move the wined3d_vk.h include to individual files.

dlls/wined3d/adapter_vk.c

@@ -17,6 +17,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/buffer.c

@@ -23,6 +23,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/context_vk.c

@@ -23,6 +23,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/device.c

@@ -25,6 +25,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);

dlls/wined3d/query.c

@@ -19,6 +19,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/resource.c

@@ -22,6 +22,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);

dlls/wined3d/sampler.c

@@ -18,6 +18,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/shader_spirv.c

@@ -18,6 +18,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
 

dlls/wined3d/swapchain.c

@@ -21,6 +21,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);

dlls/wined3d/texture.c

@@ -21,6 +21,7 @@
  */
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 WINE_DECLARE_DEBUG_CHANNEL(d3d_perf);

dlls/wined3d/utils.c

@@ -27,6 +27,7 @@
 #include <stdio.h>
 
 #include "wined3d_private.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/view.c

@@ -19,6 +19,7 @@
 
 #include "wined3d_private.h"
 #include "wined3d_shaders.h"
+#include "wined3d_vk.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
 

dlls/wined3d/wined3d_main.c

@@ -27,6 +27,8 @@
 #include "initguid.h"
 #include "wined3d_private.h"
 #include "d3d12.h"
+#define VK_NO_PROTOTYPES
+#include "wine/vulkan.h"
 #include <vkd3d.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

dlls/wined3d/wined3d_private.h

@@ -6048,6 +6048,4 @@ static inline bool wined3d_map_persistent(void)
 
 extern CRITICAL_SECTION wined3d_command_cs;
 
-#include "wined3d_vk.h"
-
 #endif

dlls/wined3d/wined3d_vk.h

@@ -24,6 +24,7 @@
 #include "wine/wined3d.h"
 #define VK_NO_PROTOTYPES
 #include "wine/vulkan.h"
+#include "wined3d_private.h"
 
 struct wined3d_buffer_vk;
 struct wined3d_context_vk;