diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-04-15 11:31:12 -0600 |
|---|---|---|
| committer | Tony Barbour <tony@LunarG.com> | 2015-04-16 19:34:59 -0600 |
| commit | 07c0c0cb3416bcf7ee7fe8a03f7216b0c57639c4 (patch) | |
| tree | b93de7a3c7b8b900b4aa47a76663ec9b316d86c0 /include | |
| parent | 2719d84e34773258791ff8ef8504cc5a06c77e91 (diff) | |
| download | usermoji-07c0c0cb3416bcf7ee7fe8a03f7216b0c57639c4.tar.xz | |
misc: Change vkEnumerateGpus to vkEnumeratePhysicalDevices
Conflicts:
loader/loader.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/vkLayer.h | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/vkLayer.h b/include/vkLayer.h index 53460c73..e9e8b037 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -30,7 +30,7 @@ typedef struct VkLayerDispatchTable_ PFN_vkGetProcAddr GetProcAddr; PFN_vkCreateInstance CreateInstance; PFN_vkDestroyInstance DestroyInstance; - PFN_vkEnumerateGpus EnumerateGpus; + PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices; PFN_vkGetGpuInfo GetGpuInfo; PFN_vkCreateDevice CreateDevice; PFN_vkDestroyDevice DestroyDevice; diff --git a/include/vulkan.h b/include/vulkan.h index d80c15a2..4e91b433 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -87,7 +87,6 @@ VK_DEFINE_SUBCLASS_HANDLE(VkQueryPool, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkFramebuffer, VkObject) VK_DEFINE_SUBCLASS_HANDLE(VkRenderPass, VkObject) -#define VK_MAX_PHYSICAL_GPUS 16 #define VK_MAX_PHYSICAL_GPU_NAME 256 #define VK_MAX_EXTENSION_NAME 256 @@ -2200,7 +2199,7 @@ typedef struct VkDispatchIndirectCmd_ // API functions typedef VkResult (VKAPI *PFN_vkCreateInstance)(const VkInstanceCreateInfo* pCreateInfo, VkInstance* pInstance); typedef VkResult (VKAPI *PFN_vkDestroyInstance)(VkInstance instance); -typedef VkResult (VKAPI *PFN_vkEnumerateGpus)(VkInstance instance, uint32_t maxGpus, uint32_t* pGpuCount, VkPhysicalGpu* pGpus); +typedef VkResult (VKAPI *PFN_vkEnumeratePhysicalDevices)(VkInstance instance, uint32_t* pPhysicalDeviceCount, VkPhysicalGpu* pPhysicalDevices); typedef VkResult (VKAPI *PFN_vkGetGpuInfo)(VkPhysicalGpu gpu, VkPhysicalGpuInfoType infoType, size_t* pDataSize, void* pData); typedef void * (VKAPI *PFN_vkGetProcAddr)(VkPhysicalGpu gpu, const char * pName); typedef VkResult (VKAPI *PFN_vkCreateDevice)(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice); @@ -2326,11 +2325,10 @@ VkResult VKAPI vkCreateInstance( VkResult VKAPI vkDestroyInstance( VkInstance instance); -VkResult VKAPI vkEnumerateGpus( +VkResult VKAPI vkEnumeratePhysicalDevices( VkInstance instance, - uint32_t maxGpus, - uint32_t* pGpuCount, - VkPhysicalGpu* pGpus); + uint32_t* pPhysicalDeviceCount, + VkPhysicalGpu* pPhysicalDevices); VkResult VKAPI vkGetGpuInfo( VkPhysicalGpu gpu, |