Module: wine Branch: master Commit: 166186ba4636b44e73f0bc2a5f059481d5c6f8a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/166186ba4636b44e73f0bc2a5f05948...
Author: Zebediah Figura zfigura@codeweavers.com Date: Thu Dec 22 15:46:40 2022 -0600
wined3d: Move the wined3d_vk.h include to individual files.
---
dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 1 + dlls/wined3d/context_vk.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/query.c | 1 + dlls/wined3d/resource.c | 1 + dlls/wined3d/sampler.c | 1 + dlls/wined3d/shader_spirv.c | 1 + dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 1 + dlls/wined3d/utils.c | 1 + dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_main.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- dlls/wined3d/wined3d_vk.h | 1 + 15 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 5b6042659aa..3dcf2230643 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -17,6 +17,7 @@ */
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fa24f006872..a3881438976 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -23,6 +23,7 @@ */
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 097f8c7032c..efc18e2ff69 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -23,6 +23,7 @@ */
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6c9d7f4368c..deb6d3dc210 100644 --- a/dlls/wined3d/device.c +++ b/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); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index be739704922..8e5f60cc7fc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -19,6 +19,7 @@ */
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 471d2f32f03..6d4dbb75ef6 100644 --- a/dlls/wined3d/resource.c +++ b/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); diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index d6e19fc521c..e6c226af1af 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -18,6 +18,7 @@ */
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index ad0a8f1b3e8..966721905a4 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -18,6 +18,7 @@ */
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index cad27d7e7ea..ac6f9ea6222 100644 --- a/dlls/wined3d/swapchain.c +++ b/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); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 32923349c6b..78b1f52221c 100644 --- a/dlls/wined3d/texture.c +++ b/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); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e34be2996b1..3618490b1c7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -27,6 +27,7 @@ #include <stdio.h>
#include "wined3d_private.h" +#include "wined3d_vk.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a95ff13410f..d318318d2b3 100644 --- a/dlls/wined3d/view.c +++ b/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);
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 15c8e237af3..0ff215f7312 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/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); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3034b947c00..6e2bdc8aaf1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/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 diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index c44e8aa45b0..170d0cc3a79 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/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;