thirdpartymirrors/lsfg-vk
1
0
Fork 0
mirror of https://github.com/PancakeTAS/lsfg-vk.git synced 2026-04-26 20:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(frame-pacing): update functions struct

Browse source 
[will not compile]
This commit is contained in:
PancakeTAS 2025-12-31 11:10:32 +01:00
parent dec803f98d
commit c93e18399d
No known key found for this signature in database
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lsfg-vk-common/include/lsfg-vk-common/vulkan/vulkan.hpp
View file

@ -51,6 +51,7 @@ namespace vk {
/// vulkan device function pointers
struct VulkanDeviceFuncs {
PFN_vkGetDeviceQueue GetDeviceQueue;
PFN_vkQueueWaitIdle QueueWaitIdle;
PFN_vkDeviceWaitIdle DeviceWaitIdle;
PFN_vkCreateCommandPool CreateCommandPool;
PFN_vkDestroyCommandPool DestroyCommandPool;
@ -119,11 +120,11 @@ namespace vk {
};
/// initialize vulkan device function pointers
/// @param fi instance function pointers
/// @param f function to get device proc addresses
/// @param device logical device handle
/// @param graphical whether the device is graphical (rather than compute)
/// @return initialized function pointers
VulkanDeviceFuncs initVulkanDeviceFuncs(const VulkanInstanceFuncs& fi, VkDevice device,
VulkanDeviceFuncs initVulkanDeviceFuncs(PFN_vkGetDeviceProcAddr f, VkDevice device,
bool graphical);
/// vulkan version wrapper

21
lsfg-vk-common/src/vulkan/vulkan.cpp
View file

@ -51,9 +51,8 @@ namespace {
namespace {
template<typename T>
T ipa(PFN_vkGetInstanceProcAddr mpa, VkInstance instance, const char* name) {
T func = reinterpret_cast<T>(
mpa(instance, name));
T ipa(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, VkInstance instance, const char* name) {
T func = reinterpret_cast<T>(vkGetInstanceProcAddr(instance, name));
if (!func)
throw ls::vulkan_error("failed to get instance proc addr for " + std::string(name));
return func;
@ -86,8 +85,7 @@ namespace {
if (res != VK_SUCCESS)
throw ls::vulkan_error(res, "vkCreateInstance() failed");
auto defunc =
ipa<PFN_vkDestroyInstance>(get_mpa(), handle, "vkDestroyInstance");
auto defunc = ipa<PFN_vkDestroyInstance>(get_mpa(), handle, "vkDestroyInstance");
if (!defunc)
throw ls::vulkan_error("failed to get vkDestroyInstance symbol");
return ls::owned_ptr<VkInstance>(
@ -150,9 +148,8 @@ namespace {
}
template<typename T>
T dpa(const VulkanInstanceFuncs& funcs, VkDevice device, const char* name) {
T func = reinterpret_cast<T>(
funcs.GetDeviceProcAddr(device, name));
T dpa(PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr, VkDevice device, const char* name) {
T func = reinterpret_cast<T>(vkGetDeviceProcAddr(device, name));
if (!func)
throw ls::vulkan_error("failed to get device proc addr for " + std::string(name));
return func;
@ -192,8 +189,7 @@ namespace {
if (res != VK_SUCCESS)
throw ls::vulkan_error(res, "vkCreateDevice() failed");
auto defunc =
dpa<PFN_vkDestroyDevice>(fi, handle, "vkDestroyDevice");
auto defunc = dpa<PFN_vkDestroyDevice>(fi.GetDeviceProcAddr, handle, "vkDestroyDevice");
if (!defunc)
throw ls::vulkan_error("failed to get vkDestroyDevice symbol");
return ls::owned_ptr<VkDevice>(
@ -312,10 +308,11 @@ VulkanInstanceFuncs vk::initVulkanInstanceFuncs(VkInstance i, PFN_vkGetInstanceP
}
/// initialize vulkan device function pointers
VulkanDeviceFuncs vk::initVulkanDeviceFuncs(const VulkanInstanceFuncs& f, VkDevice d,
VulkanDeviceFuncs vk::initVulkanDeviceFuncs(PFN_vkGetDeviceProcAddr f, VkDevice d,
bool graphical) {
return {
.GetDeviceQueue = dpa<PFN_vkGetDeviceQueue>(f, d, "vkGetDeviceQueue"),
.QueueWaitIdle = dpa<PFN_vkQueueWaitIdle>(f, d, "vkQueueWaitIdle"),
.DeviceWaitIdle = dpa<PFN_vkDeviceWaitIdle>(f, d, "vkDeviceWaitIdle"),
.CreateCommandPool = dpa<PFN_vkCreateCommandPool>(f, d, "vkCreateCommandPool"),
.DestroyCommandPool = dpa<PFN_vkDestroyCommandPool>(f, d, "vkDestroyCommandPool"),
@ -420,7 +417,7 @@ Vulkan::Vulkan(const std::string& appName, version appVersion,
)),
setLoaderData(setLoaderData),
device_funcs(initVulkanDeviceFuncs(
this->instance_funcs,
this->instance_funcs.GetDeviceProcAddr,
*this->device, false
)),
computeQueue(getQueue(this->device_funcs, *this->device,