Skip to content

device_memory_report: guard extension device commands in vkGetInstanceProcAddr #37

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

Merged
olehkuznetsov merged 7 commits into from
Sep 17, 2026
Merged

device_memory_report: guard extension device commands in vkGetInstanceProcAddr #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b93e998
device_memory_report: guard extension device commands in vkGetInstanc…
jimblacklercorp Sep 14, 2026
43e6ddc
device_memory_report: pass VkObjectType to OnDestroyObject
jimblacklercorp Sep 14, 2026
8285df4
Revert "device_memory_report: pass VkObjectType to OnDestroyObject"
jimblacklercorp Sep 16, 2026
61a4e25
device_memory_report: move KHR commands to extension dispatch and add…
jimblacklercorp Sep 16, 2026
7286c23
device_memory_report: replace extension null guards with assertions i…
jimblacklercorp Sep 16, 2026
83c41c7
device_memory_report: split global functions in GIPA and check instan…
jimblacklercorp Sep 16, 2026
8f2f3f0
Merge branch 'main' into cleanup-devmemreport-hardening
jimblacklercorp Sep 17, 2026
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
58 changes: 45 additions & 13 deletions layersvt/device_memory_report/device_memory_report_handwritten_dispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,22 @@

extern "C" {

static PFN_vkVoidFunction devmemreport_known_instance_functions(const char* pName) {
static PFN_vkVoidFunction devmemreport_known_global_functions(const char* pName) {
if (strcmp(pName, "vkGetInstanceProcAddr") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetInstanceProcAddr);
if (strcmp(pName, "vkCreateInstance") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkCreateInstance);
if (strcmp(pName, "vkEnumerateInstanceExtensionProperties") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceExtensionProperties);
if (strcmp(pName, "vkEnumerateInstanceLayerProperties") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceLayerProperties);
return nullptr;
}

static PFN_vkVoidFunction devmemreport_known_instance_functions(const char* pName) {
if (strcmp(pName, "vkDestroyInstance") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkDestroyInstance);
if (strcmp(pName, "vkEnumeratePhysicalDevices") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkEnumeratePhysicalDevices);
if (strcmp(pName, "vkEnumeratePhysicalDeviceGroups") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkEnumeratePhysicalDeviceGroups);
if (strcmp(pName, "vkEnumerateInstanceExtensionProperties") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceExtensionProperties);
if (strcmp(pName, "vkEnumerateInstanceLayerProperties") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkEnumerateInstanceLayerProperties);
return nullptr;
}

static PFN_vkVoidFunction devmemreport_known_device_functions(const char* pName) {
static PFN_vkVoidFunction devmemreport_known_core_device_functions(const char* pName) {
if (strcmp(pName, "vkGetDeviceProcAddr") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetDeviceProcAddr);
if (strcmp(pName, "vkCreateDevice") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkCreateDevice);
if (strcmp(pName, "vkDestroyDevice") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkDestroyDevice);
Expand All @@ -41,29 +45,35 @@ static PFN_vkVoidFunction devmemreport_known_device_functions(const char* pName)
if (strcmp(pName, "vkBindImageMemory") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindImageMemory);
if (strcmp(pName, "vkBindBufferMemory2") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindBufferMemory2);
if (strcmp(pName, "vkBindImageMemory2") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindImageMemory2);
if (strcmp(pName, "vkBindBufferMemory2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindBufferMemory2KHR);
if (strcmp(pName, "vkBindImageMemory2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindImageMemory2KHR);
if (strcmp(pName, "vkCreateImage") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkCreateImage);
if (strcmp(pName, "vkDestroyImage") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkDestroyImage);
if (strcmp(pName, "vkCreateBuffer") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkCreateBuffer);
if (strcmp(pName, "vkDestroyBuffer") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkDestroyBuffer);
if (strcmp(pName, "vkGetImageMemoryRequirements") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetImageMemoryRequirements);
if (strcmp(pName, "vkGetImageMemoryRequirements2") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetImageMemoryRequirements2);
if (strcmp(pName, "vkGetImageMemoryRequirements2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetImageMemoryRequirements2KHR);
if (strcmp(pName, "vkGetBufferMemoryRequirements") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetBufferMemoryRequirements);
if (strcmp(pName, "vkGetBufferMemoryRequirements2") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetBufferMemoryRequirements2);
return nullptr;
}

static PFN_vkVoidFunction devmemreport_known_device_extension_functions(const char* pName) {
if (strcmp(pName, "vkBindBufferMemory2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindBufferMemory2KHR);
if (strcmp(pName, "vkBindImageMemory2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkBindImageMemory2KHR);
if (strcmp(pName, "vkGetImageMemoryRequirements2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetImageMemoryRequirements2KHR);
if (strcmp(pName, "vkGetBufferMemoryRequirements2KHR") == 0) return reinterpret_cast<PFN_vkVoidFunction>(vkGetBufferMemoryRequirements2KHR);
return nullptr;
Comment thread
jimblacklercorp marked this conversation as resolved.
}

EXPORT_FUNCTION VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char* pName) {
PFN_vkVoidFunction func = devmemreport_known_instance_functions(pName);
static PFN_vkVoidFunction devmemreport_known_device_functions(const char* pName) {
PFN_vkVoidFunction func = devmemreport_known_core_device_functions(pName);
if (func) {
return func;
}

// If it's a device function, we can also return it here if we want to support GIPA for device functions.
func = devmemreport_known_device_functions(pName);
return devmemreport_known_device_extension_functions(pName);
}

EXPORT_FUNCTION VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char* pName) {
PFN_vkVoidFunction func = devmemreport_known_global_functions(pName);
if (func) {
return func;
}
Expand All @@ -72,12 +82,34 @@ EXPORT_FUNCTION VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(V
return nullptr;
}

func = devmemreport_known_instance_functions(pName);
if (func) {
return func;
}

// Core device functions can be returned directly from GIPA.
func = devmemreport_known_core_device_functions(pName);
if (func) {
return func;
}

auto table = instance_dispatch_table(instance);
if (table == NULL || table->GetInstanceProcAddr == NULL) {
return nullptr;
}

return table->GetInstanceProcAddr(instance, pName);
// For extension device commands, verify the underlying chain supports them before returning an interceptor.
PFN_vkVoidFunction down_func = table->GetInstanceProcAddr(instance, pName);
if (down_func == nullptr) {
return nullptr;
}

func = devmemreport_known_device_extension_functions(pName);
if (func) {
return func;
}

return down_func;
}

EXPORT_FUNCTION VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice device, const char* pName) {
Expand Down
2 changes: 2 additions & 0 deletions layersvt/device_memory_report/device_memory_report_handwritten_functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkBindBufferMemory2(VkDevice device, uint32_t bin

// Intercept memory binding via vkBindBufferMemory2KHR to correlate buffer object handles with device memory allocations.
VKAPI_ATTR VkResult VKAPI_CALL vkBindBufferMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo* pBindInfos) {
assert(device_dispatch_table(device)->BindBufferMemory2KHR != nullptr);
VkResult result = device_dispatch_table(device)->BindBufferMemory2KHR(device, bindInfoCount, pBindInfos);
if (result == VK_SUCCESS && pBindInfos != nullptr) {
RecordBufferBindings(bindInfoCount, pBindInfos);
Expand All @@ -319,6 +320,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory2(VkDevice device, uint32_t bind

// Intercept memory binding via vkBindImageMemory2KHR to correlate image object handles with device memory allocations.
VKAPI_ATTR VkResult VKAPI_CALL vkBindImageMemory2KHR(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo* pBindInfos) {
assert(device_dispatch_table(device)->BindImageMemory2KHR != nullptr);
VkResult result = device_dispatch_table(device)->BindImageMemory2KHR(device, bindInfoCount, pBindInfos);
if (result == VK_SUCCESS && pBindInfos != nullptr) {
RecordImageBinds(bindInfoCount, pBindInfos);
Expand Down
Loading