diff options
| -rw-r--r-- | deimos/vulkan/BUILD | 15 | ||||
| -rw-r--r-- | deimos/vulkan/vulkan.h | 33 | ||||
| -rw-r--r-- | deimos/vulkan/vulkan_entry_functions.inc | 2 | ||||
| -rw-r--r-- | deimos/vulkan/vulkan_loader.cpp | 61 | ||||
| -rw-r--r-- | main/BUILD | 3 | ||||
| -rw-r--r-- | main/main.cpp | 22 |
6 files changed, 121 insertions, 15 deletions
diff --git a/deimos/vulkan/BUILD b/deimos/vulkan/BUILD new file mode 100644 index 0000000..a773fa1 --- /dev/null +++ b/deimos/vulkan/BUILD @@ -0,0 +1,15 @@ +cc_library(
+ name = "vulkan",
+ hdrs = [
+ "vulkan.h",
+ ],
+ srcs = [
+ "vulkan_loader.cpp",
+ "vulkan_entry_functions.inc",
+ ],
+ deps = [
+ "//deimos/core",
+ "//3rd_party/vulkan",
+ ],
+ visibility = ["//:__subpackages__"],
+)
diff --git a/deimos/vulkan/vulkan.h b/deimos/vulkan/vulkan.h new file mode 100644 index 0000000..549deac --- /dev/null +++ b/deimos/vulkan/vulkan.h @@ -0,0 +1,33 @@ +#pragma once
+
+#include <deimos/core/id_name.h>
+#include <vulkan.h>
+
+namespace deimos
+{
+
+class ApiRegistry;
+
+struct VulkanApi
+{
+#define FN(NAME) PFN_vk##NAME NAME{};
+#include "deimos/vulkan/vulkan_entry_functions.inc"
+#undef FN
+};
+
+class VulkanLoaderApi
+{
+public:
+ VulkanLoaderApi() = default;
+ deimos_NO_COPY_MOVE(VulkanLoaderApi);
+ virtual ~VulkanLoaderApi() = default;
+
+ static constexpr IdName kApiName{"deimos::VulkanLoaderApi"};
+
+ virtual VulkanApi* LoadEntry() = 0;
+};
+
+void RegisterVulkanLoaderApi(ApiRegistry*);
+
+} // namespace deimos
+
diff --git a/deimos/vulkan/vulkan_entry_functions.inc b/deimos/vulkan/vulkan_entry_functions.inc new file mode 100644 index 0000000..97584c4 --- /dev/null +++ b/deimos/vulkan/vulkan_entry_functions.inc @@ -0,0 +1,2 @@ +FN(GetInstanceProcAddr)
+FN(CreateInstance)
diff --git a/deimos/vulkan/vulkan_loader.cpp b/deimos/vulkan/vulkan_loader.cpp new file mode 100644 index 0000000..ddd5cf0 --- /dev/null +++ b/deimos/vulkan/vulkan_loader.cpp @@ -0,0 +1,61 @@ +#include "deimos/vulkan/vulkan.h"
+
+#include <deimos/core/api_registry.h>
+#include <deimos/core/allocator.h>
+#include <deimos/core/os.h>
+#include <deimos/core/log.h>
+
+static deimos::OsApi* os_api;
+static deimos::LogApi* log_api;
+
+namespace deimos
+{
+
+class VulkanLoaderImpl : public VulkanLoaderApi
+{
+ Allocator* m_allocator;
+ gsl::owner<OsDll*> m_vulkan_dll{};
+
+public:
+ explicit VulkanLoaderImpl(Allocator* allocator) : m_allocator{allocator} {}
+
+ VulkanApi* LoadEntry() override
+ {
+ if (m_vulkan_dll == nullptr)
+ {
+ m_vulkan_dll = os_api->dll->Open("vulkan-1.dll");
+ if (m_vulkan_dll != nullptr)
+ {
+ log_api->LogInfo("Vulkan DLL loaded");
+ }
+ else
+ {
+ deimos_Panic("Couldn't load Vulkan DLL");
+ return nullptr;
+ }
+ }
+
+ VulkanApi* api = m_allocator->New<VulkanApi>();
+#define FN(NAME) api->NAME = (PFN_vk##NAME)os_api->dll->GetSymbol(m_vulkan_dll, "vk" #NAME);
+#include "deimos/vulkan/vulkan_entry_functions.inc"
+#undef FN
+ return api;
+ }
+};
+
+void RegisterVulkanLoaderApi(ApiRegistry* registry)
+{
+ os_api = registry->Get<OsApi>();
+ log_api = registry->Get<LogApi>();
+
+ auto* allocator_api = registry->Get<AllocatorApi>();
+ auto* allocator = allocator_api->CreateChild(allocator_api->system, "Vulkan");
+
+ auto* impl = allocator->New<VulkanLoaderImpl>(allocator);
+ registry->Set(impl);
+
+ log_api->LogInfo("Vulkan loader API registered");
+}
+
+} // namespace deimos
+
@@ -4,8 +4,7 @@ cc_binary( "main.cpp",
],
deps = [
- "//3rd_party/vulkan",
+ "//deimos/vulkan",
"//deimos/core",
],
)
-
diff --git a/main/main.cpp b/main/main.cpp index 80e94aa..9fb4755 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1,9 +1,7 @@ -#include "vulkan_core.h" #include <deimos/core/api_registry.h>
#include <deimos/core/log.h>
-#include <deimos/core/os.h>
#include <deimos/core/temp_allocator.h>
-#include <vulkan.h>
+#include <deimos/vulkan/vulkan.h>
using namespace deimos;
@@ -11,17 +9,15 @@ int main(int /* argc */, char* /* argv */[]) {
auto* api_registry = InitializeGlobalApiRegistry();
auto* log_api = api_registry->Get<LogApi>();
- auto* os_api = api_registry->Get<OsApi>();
+ log_api->LogInfo("Base APIs registered"); + + RegisterVulkanLoaderApi(api_registry); + auto* vulkan_loader_api = api_registry->Get<VulkanLoaderApi>(); + auto* vk = vulkan_loader_api->LoadEntry(); - log_api->LogInfo("Hello");
-
- auto* vulkan_dll = os_api->dll->Open("vulkan-1.dll");
- Ensures(vulkan_dll != nullptr);
- log_api->LogInfo("Vulkan DLL loaded");
-
- auto vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)os_api->dll->GetSymbol(vulkan_dll, "vkGetInstanceProcAddr");
- Ensures(vkGetInstanceProcAddr != nullptr);
- log_api->LogInfo("vkGetInstanceProcAddr found");
+ Ensures(vk->GetInstanceProcAddr != nullptr);
+ Ensures(vk->CreateInstance != nullptr); + log_api->LogInfo("OK");
return 0;
}
|