qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-09 17:20:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Flesh out known required windows functions

Browse source 
It looks like choosing a visual is not necessary (at least for normal
apps, VR might be another matter). Still no idea if anything works (for
-win support in general, let alone vulkan).
This commit is contained in:
Bill Currie 2021-03-29 12:03:07 +09:00
parent 574a123716
commit 2e1f3cda89
1 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
libs/video/targets/vid_win_vulkan.c
View file

@ -29,6 +29,9 @@
#endif #endif
#include "winquake.h" #include "winquake.h"
#define VK_NO_PROTOTYPES
#define VK_USE_PLATFORM_WIN32_KHR
#include <vulkan/vulkan.h>
#include "QF/cvar.h" #include "QF/cvar.h"
#include "QF/set.h" #include "QF/set.h"
@ -47,10 +50,13 @@ typedef struct vulkan_presentation_s {
#define PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name; #define PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION(name,ext) PFN_##name name;
#include "QF/Vulkan/funclist.h" #include "QF/Vulkan/funclist.h"
set_t *usable_visuals; HINSTANCE instance;
HWND window;
} vulkan_presentation_t; } vulkan_presentation_t;
static const char *required_extensions[] = { static const char *required_extensions[] = {
VK_KHR_WIN32_SURFACE_EXTENSION_NAME,
0 0
}; };
@ -91,6 +97,21 @@ unload_vulkan_library (vulkan_ctx_t *ctx)
static void static void
win_vulkan_init_presentation (vulkan_ctx_t *ctx) win_vulkan_init_presentation (vulkan_ctx_t *ctx)
{ {
ctx->presentation = calloc (1, sizeof (vulkan_presentation_t));
vulkan_presentation_t *pres = ctx->presentation;
qfv_instance_t *instance = ctx->instance;
VkInstance inst = instance->instance;
#define PRESENTATION_VULKAN_FUNCTION_FROM_EXTENSION(name, ext) \
if (instance->extension_enabled (instance, ext)) { \
pres->name = (PFN_##name) ctx->vkGetInstanceProcAddr (inst, #name); \
if (!pres->name) { \
Sys_Error ("Couldn't find instance-level function %s", #name); \
} \
}
#include "QF/Vulkan/funclist.h"
pres->instance = GetModuleHandle (0);
} }
static int static int
@ -102,7 +123,11 @@ win_vulkan_get_presentation_support (vulkan_ctx_t *ctx,
win_vulkan_init_presentation (ctx); win_vulkan_init_presentation (ctx);
} }
vulkan_presentation_t *pres = ctx->presentation; vulkan_presentation_t *pres = ctx->presentation;
return !set_is_empty (pres->usable_visuals); if (pres->vkGetPhysicalDeviceWin32PresentationSupportKHR (
physicalDevice, queueFamilyIndex)) {
return 1;
}
return 0;
} }
static void static void
@ -113,13 +138,28 @@ win_vulkan_choose_visual (vulkan_ctx_t *ctx)
static void static void
win_vulkan_create_window (vulkan_ctx_t *ctx) win_vulkan_create_window (vulkan_ctx_t *ctx)
{ {
vulkan_presentation_t *pres = ctx->presentation;
pres->window = win_mainwindow;
} }
static VkSurfaceKHR static VkSurfaceKHR
win_vulkan_create_surface (vulkan_ctx_t *ctx) win_vulkan_create_surface (vulkan_ctx_t *ctx)
{ {
vulkan_presentation_t *pres = ctx->presentation;
VkInstance inst = ctx->instance->instance;
VkSurfaceKHR surface;
VkWin32SurfaceCreateInfoKHR createInfo = {
.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR,
.flags = 0,
.hinstance = pres->instance,
.hwnd = pres->window,
};
if (pres->vkCreateWin32SurfaceKHR (inst, &createInfo, 0, &surface)
!= VK_SUCCESS) {
return 0; return 0;
} }
return surface;
}
vulkan_ctx_t * vulkan_ctx_t *
Win_Vulkan_Context (void) Win_Vulkan_Context (void)