phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-14 00:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(vulkan): MSAA crash on AMD RADV due to vkCreateRenderPass2 null dispatch
Some checks are pending
Build / Build (arm64) (push) Waiting to run
Details
Build / Build (x86-64) (push) Waiting to run
Details
Build / Build (macOS arm64) (push) Waiting to run
Details
Build / Build (windows-arm64) (push) Waiting to run
Details
Build / Build (windows-x86-64) (push) Waiting to run
Details
Security / CodeQL (C/C++) (push) Waiting to run
Details
Security / Semgrep (push) Waiting to run
Details
Security / Sanitizer Build (ASan/UBSan) (push) Waiting to run
Details

Browse source 
Instance was created with Vulkan 1.1 but depthResolveSupported_ was gated
on the physical device's API version (1.2+ on RADV). This caused
vkCreateRenderPass2 (core 1.2) to dispatch through a null function pointer
when MSAA was enabled. Now requests 1.2 instance with 1.1 minimum fallback
and gates depth resolve on the actual instance API version. Also removes
all diagnostic crash-phase instrumentation from the previous investigation.
This commit is contained in:
Kelsi 2026-04-03 20:58:32 -07:00
parent 9c4e61a227
commit 17c16150d6
6 changed files with 22 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/rendering/vk_context.cpp
View file

@ -270,7 +270,8 @@ bool VkContext::createInstance(SDL_Window* window) {
vkb::InstanceBuilder builder;
builder.set_app_name("Wowee")
.set_app_version(VK_MAKE_VERSION(1, 0, 0))
.require_api_version(1, 1, 0);
.require_api_version(1, 2, 0)
.set_minimum_instance_version(1, 1, 0);
for (auto ext : sdlExts) {
builder.enable_extension(ext);
@ -291,7 +292,14 @@ bool VkContext::createInstance(SDL_Window* window) {
instance = vkbInstance_.instance;
debugMessenger = vkbInstance_.debug_messenger;
LOG_INFO("Vulkan instance created");
// Query the actual instance API version for gating core 1.2+ calls
uint32_t instVer = VK_API_VERSION_1_1;
if (vkEnumerateInstanceVersion(&instVer) != VK_SUCCESS)
instVer = VK_API_VERSION_1_1;
instanceApiVersion_ = instVer;
LOG_INFO("Vulkan instance created (instance API version: ",
VK_VERSION_MAJOR(instVer), ".", VK_VERSION_MINOR(instVer), ".",
VK_VERSION_PATCH(instVer), ")");
return true;
}
@ -337,7 +345,10 @@ bool VkContext::selectPhysicalDevice() {
props2.pNext = &dsResolveProps;
vkGetPhysicalDeviceProperties2(physicalDevice, &props2);
if (apiVersion >= VK_API_VERSION_1_2) {
// Gate on instance API version — vkCreateRenderPass2 is core 1.2 and only
// available when the instance was created with apiVersion >= 1.2.
// The device may report 1.2+ but a 1.1 instance won't have the function pointer.
if (instanceApiVersion_ >= VK_API_VERSION_1_2) {
VkResolveModeFlags modes = dsResolveProps.supportedDepthResolveModes;
if (modes & VK_RESOLVE_MODE_SAMPLE_ZERO_BIT) {
depthResolveMode_ = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;
@ -467,7 +478,7 @@ bool VkContext::createAllocator() {
allocInfo.instance = instance;
allocInfo.physicalDevice = physicalDevice;
allocInfo.device = device;
allocInfo.vulkanApiVersion = VK_API_VERSION_1_1;
allocInfo.vulkanApiVersion = instanceApiVersion_;
if (vmaCreateAllocator(&allocInfo, &allocator) != VK_SUCCESS) {
LOG_ERROR("Failed to create VMA allocator");