[dxvk] Move Vulkan loader to separate directory

src/dxgi/dxgi_adapter.cpp

@@ -11,8 +11,6 @@
 #include "dxgi_options.h"
 #include "dxgi_output.h"
 
-#include "../dxvk/vulkan/dxvk_vulkan_names.h"
-
 namespace dxvk {
 
   DxgiAdapter::DxgiAdapter(

src/dxvk/dxvk_include.h

@@ -16,5 +16,5 @@
 
 #include "../util/sync/sync_spinlock.h"
 
-#include "./vulkan/dxvk_vulkan_loader.h"
-#include "./vulkan/dxvk_vulkan_names.h"
+#include "../vulkan/vulkan_loader.h"
+#include "../vulkan/vulkan_names.h"

src/dxvk/meson.build

@@ -96,16 +96,13 @@ dxvk_src = files([
   'hud/dxvk_hud_fps.cpp',
   'hud/dxvk_hud_renderer.cpp',
   'hud/dxvk_hud_stats.cpp',
-  
-  'vulkan/dxvk_vulkan_loader.cpp',
-  'vulkan/dxvk_vulkan_names.cpp',
 ])
 
 thread_dep = dependency('threads')
 
 dxvk_lib = static_library('dxvk', dxvk_src, glsl_generator.process(dxvk_shaders), dxvk_version,
   link_with           : [ util_lib, spirv_lib ],
-  dependencies        : [ thread_dep, lib_vulkan ],
+  dependencies        : [ thread_dep, vkcommon_dep ],
   include_directories : [ dxvk_include_path ],
   override_options    : ['cpp_std='+dxvk_cpp_std])
 

src/meson.build

@@ -1,5 +1,6 @@
 subdir('util')
 subdir('spirv')
+subdir('vulkan')
 subdir('dxvk')
 subdir('dxgi')
 subdir('dxbc')

src/vulkan/meson.build

@@ -0,0 +1,15 @@
+vkcommon_src = files([
+  'vulkan_loader.cpp',
+  'vulkan_names.cpp',
+])
+
+thread_dep = dependency('threads')
+
+vkcommon_lib = static_library('vkcommon', vkcommon_src,
+  dependencies        : [ thread_dep, lib_vulkan ],
+  override_options    : ['cpp_std='+dxvk_cpp_std],
+  include_directories : [ dxvk_include_path ])
+
+vkcommon_dep = declare_dependency(
+  link_with           : [ vkcommon_lib ],
+  include_directories : [ dxvk_include_path ])

src/vulkan/vulkan_loader.cpp

@@ -1,4 +1,4 @@
-#include "dxvk_vulkan_loader.h"
+#include "vulkan_loader.h"
 
 namespace dxvk::vk {
 

src/vulkan/vulkan_loader.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../../util/rc/util_rc.h"
-#include "../../util/rc/util_rc_ptr.h"
+#include "../util/rc/util_rc.h"
+#include "../util/rc/util_rc_ptr.h"
 
-#include "dxvk_vulkan_loader_fn.h"
+#include "vulkan_loader_fn.h"
 
 namespace dxvk::vk {
   

src/vulkan/vulkan_names.cpp

@@ -1,4 +1,4 @@
-#include "dxvk_vulkan_names.h"
+#include "vulkan_names.h"
     
 std::ostream& operator << (std::ostream& os, VkPipelineCacheHeaderVersion e) {
   switch (e) {

src/vulkan/vulkan_names.h

@@ -2,9 +2,9 @@
 
 #include <ostream>
 
-#include "../../util/util_enum.h"
+#include "../util/util_enum.h"
 
-#include "dxvk_vulkan_loader_fn.h"
+#include "vulkan_loader_fn.h"
 
 std::ostream& operator << (std::ostream& os, VkPipelineCacheHeaderVersion e);
 std::ostream& operator << (std::ostream& os, VkResult e);