vulkan: move GetDeviceQueue_Bottom
Move it from loader.cpp to driver.cpp and rename it to
driver::GetDeviceQueue. No functional change.
Change-Id: Ide8ebe044e62b8ef6fc64ac03dcc1d920f5bf9a6
diff --git a/vulkan/libvulkan/code-generator.tmpl b/vulkan/libvulkan/code-generator.tmpl
index 23c2717..4ec13a0 100644
--- a/vulkan/libvulkan/code-generator.tmpl
+++ b/vulkan/libvulkan/code-generator.tmpl
@@ -834,6 +834,8 @@
{{if eq $.Name "vkGetDeviceProcAddr"}}
reinterpret_cast<PFN_vkVoidFunction>({{$base}}),
+ {{else if eq $.Name "vkGetDeviceQueue"}}
+ reinterpret_cast<PFN_vkVoidFunction>({{$base}}),
{{else}}
reinterpret_cast<PFN_vkVoidFunction>({{$base}}_Bottom),
{{end}}
diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index d517c72..1641e31 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -205,5 +205,15 @@
: hook->disabled_proc;
}
+void GetDeviceQueue(VkDevice device,
+ uint32_t queueFamilyIndex,
+ uint32_t queueIndex,
+ VkQueue* pQueue) {
+ const auto& data = GetData(device);
+
+ data.driver.GetDeviceQueue(device, queueFamilyIndex, queueIndex, pQueue);
+ SetData(*pQueue, data);
+}
+
} // namespace driver
} // namespace vulkan
diff --git a/vulkan/libvulkan/driver.h b/vulkan/libvulkan/driver.h
index 7af63fa..8569a52 100644
--- a/vulkan/libvulkan/driver.h
+++ b/vulkan/libvulkan/driver.h
@@ -108,6 +108,8 @@
VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance, const char* pName);
VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pName);
VKAPI_ATTR VkResult EnumerateInstanceExtensionProperties(const char* pLayerName, uint32_t* pPropertyCount, VkExtensionProperties* pProperties);
+
+VKAPI_ATTR void GetDeviceQueue(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue);
// clang-format on
template <typename DispatchableType>
diff --git a/vulkan/libvulkan/driver_gen.cpp b/vulkan/libvulkan/driver_gen.cpp
index 87987c8..b6081f0 100644
--- a/vulkan/libvulkan/driver_gen.cpp
+++ b/vulkan/libvulkan/driver_gen.cpp
@@ -268,7 +268,7 @@
"vkGetDeviceQueue",
ProcHook::DEVICE,
ProcHook::EXTENSION_CORE,
- reinterpret_cast<PFN_vkVoidFunction>(GetDeviceQueue_Bottom),
+ reinterpret_cast<PFN_vkVoidFunction>(GetDeviceQueue),
nullptr,
nullptr,
},
diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp
index 3e5ea22..96eae53 100644
--- a/vulkan/libvulkan/loader.cpp
+++ b/vulkan/libvulkan/loader.cpp
@@ -638,16 +638,6 @@
DestroyDevice(&GetDispatchParent(vkdevice), vkdevice);
}
-void GetDeviceQueue_Bottom(VkDevice vkdevice,
- uint32_t family,
- uint32_t index,
- VkQueue* queue_out) {
- const auto& data = driver::GetData(vkdevice);
-
- data.driver.GetDeviceQueue(vkdevice, family, index, queue_out);
- driver::SetData(*queue_out, data);
-}
-
VkResult AllocateCommandBuffers_Bottom(
VkDevice vkdevice,
const VkCommandBufferAllocateInfo* alloc_info,
diff --git a/vulkan/libvulkan/loader.h b/vulkan/libvulkan/loader.h
index a2c7e83..2183c29 100644
--- a/vulkan/libvulkan/loader.h
+++ b/vulkan/libvulkan/loader.h
@@ -53,7 +53,6 @@
VKAPI_ATTR VkResult CreateDevice_Bottom(VkPhysicalDevice pdev, const VkDeviceCreateInfo* create_info, const VkAllocationCallbacks* allocator, VkDevice* device_out);
VKAPI_ATTR void DestroyInstance_Bottom(VkInstance vkinstance, const VkAllocationCallbacks* allocator);
VKAPI_ATTR void DestroyDevice_Bottom(VkDevice device, const VkAllocationCallbacks* pAllocator);
-VKAPI_ATTR void GetDeviceQueue_Bottom(VkDevice device, uint32_t queueFamilyIndex, uint32_t queueIndex, VkQueue* pQueue);
VKAPI_ATTR VkResult AllocateCommandBuffers_Bottom(VkDevice device, const VkCommandBufferAllocateInfo* pAllocateInfo, VkCommandBuffer* pCommandBuffers);
// clang-format on