Jacek Caban : wined3d: Don't use vulkan_driver.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 89e7dc3a29fac3f74c9996d317a77e72b88dbd88
URL:    https://gitlab.winehq.org/wine/wine/-/commit/89e7dc3a29fac3f74c9996d317a77e7...

Author: Jacek Caban 
Date:   Fri Jul 15 13:46:38 2022 +0200

wined3d: Don't use vulkan_driver.h.

---

dlls/wined3d/adapter_vk.c      | 20 --------------------
 dlls/wined3d/wined3d_private.h |  1 -
 dlls/wined3d/wined3d_vk.h      |  5 -----
 3 files changed, 26 deletions(-)

diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c
index 3b87ab63ee5..81248d40f46 100644
--- a/dlls/wined3d/adapter_vk.c
+++ b/dlls/wined3d/adapter_vk.c
@@ -18,8 +18,6 @@

#include "wined3d_private.h"

-#include "wine/vulkan_driver.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);

static const struct wined3d_state_entry_template misc_state_template_vk[] =
@@ -214,7 +212,6 @@ static HRESULT hresult_from_vk_result(VkResult vr)
     }
 }

-#ifdef USE_WIN32_VULKAN
 static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info)
 {
     struct vulkan_ops *vk_ops = &vk_info->vk_ops;
@@ -244,23 +241,6 @@ static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info)
         vk_info->vulkan_lib = NULL;
     }
 }
-#else
-static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info)
-{
-    struct vulkan_ops *vk_ops = &vk_info->vk_ops;
-    const struct vulkan_funcs *vk_funcs;
-
-    vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION);
-
-    if (!vk_funcs)
-        return FALSE;
-
-    vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr;
-    return TRUE;
-}
-
-static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {}
-#endif

static void adapter_vk_destroy(struct wined3d_adapter *adapter)
 {
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 72732df7b4d..09ba3487616 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -25,7 +25,6 @@
 #ifndef __WINE_WINED3D_PRIVATE_H
 #define __WINE_WINED3D_PRIVATE_H

-#define USE_WIN32_VULKAN
 #define USE_WIN32_OPENGL

#ifdef USE_WIN32_OPENGL
diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h
index 91ef8c816cd..00818f98b81 100644
--- a/dlls/wined3d/wined3d_vk.h
+++ b/dlls/wined3d/wined3d_vk.h
@@ -20,9 +20,6 @@
 #define __WINE_WINED3D_VK_H

#define VK_NO_PROTOTYPES
-#ifndef USE_WIN32_VULKAN
-#define WINE_VK_HOST
-#endif
 #include "wine/vulkan.h"

#define VK_INSTANCE_FUNCS() \
@@ -225,9 +222,7 @@ struct wined3d_vk_info
     unsigned int api_version;

BOOL supported[WINED3D_VK_EXT_COUNT];
-#ifdef USE_WIN32_VULKAN
     HMODULE vulkan_lib;
-#endif
 };

#define VK_CALL(f) (vk_info->vk_ops.f)