Skip to content

LSFG: initialize loader data for adopted-device framegen command buffers #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
butilly wants to merge 1 commit into
base: release
Choose a base branch
from
Open

LSFG: initialize loader data for adopted-device framegen command buffers #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions framegen/src/core/device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,12 @@ Device::Device(const Instance& instance, VkPhysicalDevice physical,
new VkDevice(external),
[](VkDevice* device) { delete device; }
);
LSFG_FRAMEGEN_LOGI("Adopted-device init: creating fallback descriptor image");
this->fallbackDescriptorImage = std::make_shared<Core::Image>(*this,
VkExtent2D{1, 1}, VK_FORMAT_R8G8B8A8_UNORM,
VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT
| VK_IMAGE_USAGE_TRANSFER_DST_BIT);
LSFG_FRAMEGEN_LOGI("Adopted-device init: clearing fallback descriptor image");
Utils::clearImage(*this, *this->fallbackDescriptorImage);
LSFG_FRAMEGEN_LOGI("Adopted-device init: fallback descriptor ready");
}
32 changes: 32 additions & 0 deletions src/layer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <exception>
#include <iostream>
#include <cstdint>
#include <cstring>
#include <string>

namespace {
Expand Down Expand Up @@ -76,6 +77,31 @@ namespace {
PFN_vkInvalidateMappedMemoryRanges next_vkInvalidateMappedMemoryRanges{};
PFN_vkCmdCopyImageToBuffer next_vkCmdCopyImageToBuffer{};

// Framegen adopts the game's device but allocates below the loader via
// Volk. Dispatchable objects created by a layer must receive loader data,
// just like the command buffers allocated by Mini::CommandBuffer.
VkResult framegenAllocateCommandBuffers(
VkDevice device,
const VkCommandBufferAllocateInfo* info,
VkCommandBuffer* buffers) {
auto res = next_vkAllocateCommandBuffers(device, info, buffers);
if (res != VK_SUCCESS)
return res;
for (uint32_t i = 0; i < info->commandBufferCount; ++i) {
res = next_vSetDeviceLoaderData(device, buffers[i]);
if (res != VK_SUCCESS) {
std::cerr << "lsfg-vk: framegen command buffer loader setup failed: "
<< res << '\n';
next_vkFreeCommandBuffers(device, info->commandPool,
info->commandBufferCount, buffers);
for (uint32_t j = 0; j < info->commandBufferCount; ++j)
buffers[j] = VK_NULL_HANDLE;
return res;
}
}
return VK_SUCCESS;
}

template<typename T>
bool initInstanceFunc(VkInstance instance, const char* name, T* func) {
*func = reinterpret_cast<T>(next_vkGetInstanceProcAddr(instance, name));
Expand Down Expand Up @@ -361,11 +387,17 @@ namespace Layer {
PFN_vkVoidFunction ovkGetInstanceProcAddr(
VkInstance instance,
const char* pName) {
// Keep Volk's adopted-device dispatch below our hooks, while routing
// its allocations through the loader-data adapter above.
if (std::strcmp(pName, "vkGetDeviceProcAddr") == 0)
return reinterpret_cast<PFN_vkVoidFunction>(ovkGetDeviceProcAddr);
return next_vkGetInstanceProcAddr(instance, pName);
}
PFN_vkVoidFunction ovkGetDeviceProcAddr(
VkDevice device,
const char* pName) {
if (std::strcmp(pName, "vkAllocateCommandBuffers") == 0)
return reinterpret_cast<PFN_vkVoidFunction>(framegenAllocateCommandBuffers);
return next_vkGetDeviceProcAddr(device, pName);
}

Expand Down
Loading