diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-05-18 13:20:15 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-17 19:47:02 -0600 |
| commit | 50cfda92e7f3368f0d5665893a3888385ef60442 (patch) | |
| tree | 7b1008962a13d42b189bb7f991a07f8750d22c5b /include | |
| parent | 8db8b2a888f0e4206586b10a8ceee11c2b3bb314 (diff) | |
| download | usermoji-50cfda92e7f3368f0d5665893a3888385ef60442.tar.xz | |
misc: Change vkGetProcAddr to vkGetDeviceProcAddr
Also cleanup layer/loader GPA's to only return device level entrypoints.
Diffstat (limited to 'include')
| -rw-r--r-- | include/vkLayer.h | 3 | ||||
| -rw-r--r-- | include/vulkan.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/vkLayer.h b/include/vkLayer.h index 9edf3266..f30ef256 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -26,7 +26,7 @@ typedef struct VkBaseLayerObject_ typedef struct VkLayerDispatchTable_ { - PFN_vkGetProcAddr GetProcAddr; + PFN_vkGetDeviceProcAddr GetDeviceProcAddr; PFN_vkDestroyDevice DestroyDevice; PFN_vkGetDeviceQueue GetDeviceQueue; PFN_vkQueueSubmit QueueSubmit; @@ -145,7 +145,6 @@ typedef struct VkLayerDispatchTable_ typedef struct VkLayerInstanceDispatchTable_ { PFN_vkGetInstanceProcAddr GetInstanceProcAddr; - PFN_vkGetProcAddr GetProcAddr; // TODO remove once GPA takes device parameter PFN_vkCreateInstance CreateInstance; PFN_vkDestroyInstance DestroyInstance; PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices; diff --git a/include/vulkan.h b/include/vulkan.h index b8bd81e5..89431af2 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -2088,7 +2088,7 @@ typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance); typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceInfo)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceInfoType infoType, size_t* pDataSize, void* pData); typedef void * (VKAPI *PFN_vkGetInstanceProcAddr)(VkInstance instance, const char * pName); -typedef void * (VKAPI *PFN_vkGetProcAddr)(VkPhysicalDevice physicalDevice, const char * pName); +typedef void * (VKAPI *PFN_vkGetDeviceProcAddr)(VkDevice device, const char * pName); typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice); typedef VkResult (VKAPI *PFN_vkDestroyDevice)(VkDevice device); typedef VkResult (VKAPI *PFN_vkGetGlobalExtensionInfo)(VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData); @@ -2224,8 +2224,8 @@ void * VKAPI vkGetInstanceProcAddr( VkInstance instance, const char* pName); -void * VKAPI vkGetProcAddr( - VkPhysicalDevice physicalDevice, +void * VKAPI vkGetDeviceProcAddr( + VkDevice device, const char* pName); // Device functions |