diff options
| author | Quentin LADEVIE <qladevie@wanadev.fr> | 2022-07-25 21:15:02 +0200 |
|---|---|---|
| committer | Quentin LADEVIE <qladevie@wanadev.fr> | 2022-07-25 21:15:02 +0200 |
| commit | 969dd101a08997dc318207b6994201d5161d0bd3 (patch) | |
| tree | 52664a681889a608a5586882c115c4b8e0eef32b | |
| parent | e77054b80568f65aaf8a6201cf8432d000288209 (diff) | |
Improve vulkan loader win32 code
| -rw-r--r-- | include/vk-api.hpp | 2 | ||||
| -rw-r--r-- | include/vk-context.hpp | 2 | ||||
| -rw-r--r-- | include/vulkan-loader.hpp | 13 | ||||
| -rw-r--r-- | src/main.cpp | 3 | ||||
| -rw-r--r-- | src/vk-api.cpp | 1 |
5 files changed, 17 insertions, 4 deletions
diff --git a/include/vk-api.hpp b/include/vk-api.hpp index f4376cd..2391b60 100644 --- a/include/vk-api.hpp +++ b/include/vk-api.hpp @@ -4,7 +4,7 @@ #include <vector> #include <cassert> -#include <vulkan/vulkan.h> +#include "vulkan-loader.hpp" using VmaAllocation = struct VmaAllocation_T*; using VmaMemoryUsage = enum VmaMemoryUsage; diff --git a/include/vk-context.hpp b/include/vk-context.hpp index 7638d07..078b3c0 100644 --- a/include/vk-context.hpp +++ b/include/vk-context.hpp @@ -2,7 +2,7 @@ #define __VK_CONTEXT_HPP_ #include <vector> -#include <vulkan/vulkan.h> +#include "vulkan-loader.hpp" using VmaAllocator = struct VmaAllocator_T*; diff --git a/include/vulkan-loader.hpp b/include/vulkan-loader.hpp index e15a447..e3e2cd4 100644 --- a/include/vulkan-loader.hpp +++ b/include/vulkan-loader.hpp @@ -1,7 +1,20 @@ #ifndef __VULKAN_LOADER_HPP_ #define __VULKAN_LOADER_HPP_ +#if defined(WINDOWS) +#include <vulkan/vk_platform.h> +#include <vulkan/vulkan_core.h> +typedef unsigned long DWORD; +typedef const wchar_t* LPCWSTR; +typedef void* HANDLE; +typedef struct HINSTANCE__* HINSTANCE; +typedef struct HWND__* HWND; +typedef struct HMONITOR__* HMONITOR; +typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; +#include <vulkan/vulkan_win32.h> +#else #include <vulkan/vulkan.h> +#endif #define VULKAN_EXPORTED_FUNCTIONS \ X(vkGetInstanceProcAddr) \ diff --git a/src/main.cpp b/src/main.cpp index 368a429..1e5e556 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -128,7 +128,6 @@ int main() { Buffer* ui_vertex_buffer = nullptr; Buffer* ui_index_buffer = nullptr; - std::string ui_shader_name = "ui"; std::vector<Primitive*> ui_primitives; auto ui_pass = renderer.create_primitive_renderpass(); ui_pass->set_viewport(0.f, 0.f, (float)width, (float)height); @@ -350,7 +349,7 @@ int main() { for (size_t index = previous_size; index < ui_primitives.size(); index++) { ui_primitives[index] = renderer.create_primitive(*ui_pass); - ui_primitives[index]->set_pipeline(ui_shader_name); + ui_primitives[index]->set_pipeline("ui"); ui_primitives[index]->set_constant_offset(64); ui_primitives[index]->set_constant(32, ui_texture); ui_primitives[index]->set_constant(36, ui_texture_sampler); diff --git a/src/vk-api.cpp b/src/vk-api.cpp index 9c5a5c5..1c7f187 100644 --- a/src/vk-api.cpp +++ b/src/vk-api.cpp @@ -7,6 +7,7 @@ #include "window.hpp" #include "utils.hpp" #include "vk-context.hpp" + #include "vulkan-loader.hpp" #ifdef _DEBUG |