v115: remove GetPhysicalDevicePerformance

11 files changed, 32 insertions, 144 deletions

diff --git a/demos/cube.c b/demos/cube.c
index b4b1a48c..e3952bfe 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -965,7 +965,7 @@ static void demo_prepare_textures(struct demo *demo)
     VkResult U_ASSERT_ONLY err;
     uint32_t i;
 
-    err = vkGetPhysicalDeviceFormatInfo(demo->gpu, tex_format, &props);
+    err = vkGetPhysicalDeviceFormatProperties(demo->gpu, tex_format, &props);
     assert(!err);
 
     for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index c3d66027..b063eece 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -105,7 +105,6 @@ struct app_gpu {
     VkPhysicalDevice obj;
 
     VkPhysicalDeviceProperties props;
-    VkPhysicalDevicePerformance perf;
 
     uint32_t queue_count;
     VkPhysicalDeviceQueueProperties *queue_props;
@@ -367,7 +366,7 @@ static void app_dev_init_formats(struct app_dev *dev)
         const VkFormat fmt = f;
         VkResult err;
 
-        err = vkGetPhysicalDeviceFormatInfo(dev->gpu->obj, fmt, &dev->format_props[f]);
+        err = vkGetPhysicalDeviceFormatProperties(dev->gpu->obj, fmt, &dev->format_props[f]);
         if (err) {
             memset(&dev->format_props[f], 0,
                    sizeof(dev->format_props[f]));
@@ -671,10 +670,6 @@ static void app_gpu_init(struct app_gpu *gpu, uint32_t id, VkPhysicalDevice obj)
     if (err)
         ERR_EXIT(err);
 
-    err = vkGetPhysicalDevicePerformance(gpu->obj, &gpu->perf);
-    if (err)
-        ERR_EXIT(err);
-
     /* get queue count */
     err = vkGetPhysicalDeviceQueueCount(gpu->obj, &gpu->queue_count);
     if (err)
@@ -815,19 +810,6 @@ static void app_gpu_dump_props(const struct app_gpu *gpu)
     fflush(stdout);
 }
 
-static void app_gpu_dump_perf(const struct app_gpu *gpu)
-{
-    const VkPhysicalDevicePerformance *perf = &gpu->perf;
-
-    printf("VkPhysicalDevicePerformance\n");
-    printf("\tmaxGpuClock = %f\n",      perf->maxDeviceClock);
-    printf("\taluPerClock = %f\n",      perf->aluPerClock);
-    printf("\ttexPerClock = %f\n",      perf->texPerClock);
-    printf("\tprimsPerClock = %f\n",    perf->primsPerClock);
-    printf("\tpixelsPerClock = %f\n",   perf->pixelsPerClock);
-    fflush(stdout);
-}
-
 static void app_dump_extensions(
         const char *indent,
         const char *layer_name,
@@ -926,8 +908,6 @@ static void app_gpu_dump(const struct app_gpu *gpu)
         fflush(stdout);
     }
     printf("\n");
-    app_gpu_dump_perf(gpu);
-    printf("\n");
     for (i = 0; i < gpu->queue_count; i++) {
         app_gpu_dump_queue_props(gpu, i);
         printf("\n");
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index e2d36c08..15077eee 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -1441,7 +1441,7 @@ ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceFeatures(
     return ret;
 }
 
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatInfo(
+ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatProperties(
     VkPhysicalDevice                          physicalDevice,
     VkFormat                                  format,
     VkFormatProperties*                       pFormatInfo)
@@ -1468,19 +1468,6 @@ ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceLimits(
     return ret;
 }
 
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDevicePerformance(
-    VkPhysicalDevice                             gpu_,
-    VkPhysicalDevicePerformance*                  pPerformance)
-{
-    pPerformance->maxDeviceClock = 1.0f;
-    pPerformance->aluPerClock = 1.0f;
-    pPerformance->texPerClock = 1.0f;
-    pPerformance->primsPerClock = 1.0f;
-    pPerformance->pixelsPerClock = 1.0f;
-
-    return VK_SUCCESS;
-}
-
 ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueCount(
     VkPhysicalDevice                             gpu_,
     uint32_t*                                    pCount)
diff --git a/include/vk_layer.h b/include/vk_layer.h
index 25c30e22..02591550 100644
--- a/include/vk_layer.h
+++ b/include/vk_layer.h
@@ -179,11 +179,10 @@ typedef struct VkLayerInstanceDispatchTable_
     PFN_vkDestroyInstance DestroyInstance;
     PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices;
     PFN_vkGetPhysicalDeviceFeatures GetPhysicalDeviceFeatures;
-    PFN_vkGetPhysicalDeviceFormatInfo GetPhysicalDeviceFormatInfo;
+    PFN_vkGetPhysicalDeviceFormatProperties GetPhysicalDeviceFormatProperties;
     PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits;
     PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties;
     PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
-    PFN_vkGetPhysicalDevicePerformance GetPhysicalDevicePerformance;
     PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount;
     PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties;
     PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties;
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 8a7c672e..7a048618 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1825,7 +1825,7 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFeatures(
     return result;
 }
 
-bool PostGetPhysicalDeviceFormatInfo(
+bool PostGetPhysicalDeviceFormatProperties(
     VkPhysicalDevice physicalDevice,
     VkFormat format,
     VkFormatProperties* pFormatInfo,
@@ -1836,32 +1836,32 @@ bool PostGetPhysicalDeviceFormatInfo(
         format > VK_FORMAT_END_RANGE)
     {
         log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkGetPhysicalDeviceFormatInfo parameter, VkFormat format, is unrecognized enumerator");
+        "vkGetPhysicalDeviceFormatProperties parameter, VkFormat format, is unrecognized enumerator");
         return false;
     }
 
     if(pFormatInfo == nullptr)
     {
         log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkGetPhysicalDeviceFormatInfo parameter, VkFormatProperties* pFormatInfo, is null pointer");
+        "vkGetPhysicalDeviceFormatProperties parameter, VkFormatProperties* pFormatInfo, is null pointer");
         return false;
     }
     if(!ValidateEnumerator((VkFormatFeatureFlagBits)pFormatInfo->linearTilingFeatures))
     {
-        std::string reason = "vkGetPhysicalDeviceFormatInfo parameter, VkFormatFeatureFlags pFormatInfo->linearTilingFeatures, is " + EnumeratorString((VkFormatFeatureFlagBits)pFormatInfo->linearTilingFeatures);
+        std::string reason = "vkGetPhysicalDeviceFormatProperties parameter, VkFormatFeatureFlags pFormatInfo->linearTilingFeatures, is " + EnumeratorString((VkFormatFeatureFlagBits)pFormatInfo->linearTilingFeatures);
         log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
         return false;
     }
     if(!ValidateEnumerator((VkFormatFeatureFlagBits)pFormatInfo->optimalTilingFeatures))
     {
-        std::string reason = "vkGetPhysicalDeviceFormatInfo parameter, VkFormatFeatureFlags pFormatInfo->optimalTilingFeatures, is " + EnumeratorString((VkFormatFeatureFlagBits)pFormatInfo->optimalTilingFeatures);
+        std::string reason = "vkGetPhysicalDeviceFormatProperties parameter, VkFormatFeatureFlags pFormatInfo->optimalTilingFeatures, is " + EnumeratorString((VkFormatFeatureFlagBits)pFormatInfo->optimalTilingFeatures);
         log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
         return false;
     }
 
     if(result != VK_SUCCESS)
     {
-        std::string reason = "vkGetPhysicalDeviceFormatInfo parameter, VkResult result, is " + EnumeratorString(result);
+        std::string reason = "vkGetPhysicalDeviceFormatProperties parameter, VkResult result, is " + EnumeratorString(result);
         log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
         return false;
     }
@@ -1869,14 +1869,14 @@ bool PostGetPhysicalDeviceFormatInfo(
     return true;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatInfo(
+VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatProperties(
     VkPhysicalDevice physicalDevice,
     VkFormat format,
     VkFormatProperties* pFormatInfo)
 {
-    VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceFormatInfo(physicalDevice, format, pFormatInfo);
+    VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatInfo);
 
-    PostGetPhysicalDeviceFormatInfo(physicalDevice, format, pFormatInfo, result);
+    PostGetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatInfo, result);
 
     return result;
 }
@@ -1990,40 +1990,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties(
     return result;
 }
 
-bool PostGetPhysicalDevicePerformance(
-    VkPhysicalDevice physicalDevice,
-    VkPhysicalDevicePerformance* pPerformance,
-    VkResult result)
-{
-
-    if(pPerformance == nullptr)
-    {
-        log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK",
-        "vkGetPhysicalDevicePerformance parameter, VkPhysicalDevicePerformance* pPerformance, is null pointer");
-        return false;
-    }
-
-    if(result != VK_SUCCESS)
-    {
-        std::string reason = "vkGetPhysicalDevicePerformance parameter, VkResult result, is " + EnumeratorString(result);
-        log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str());
-        return false;
-    }
-
-    return true;
-}
-
-VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDevicePerformance(
-    VkPhysicalDevice physicalDevice,
-    VkPhysicalDevicePerformance* pPerformance)
-{
-    VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDevicePerformance(physicalDevice, pPerformance);
-
-    PostGetPhysicalDevicePerformance(physicalDevice, pPerformance, result);
-
-    return result;
-}
-
 bool PostGetPhysicalDeviceQueueCount(
     VkPhysicalDevice physicalDevice,
     uint32_t* pCount,
@@ -8695,8 +8661,8 @@ VK_LAYER_EXPORT void* VKAPI vkGetInstanceProcAddr(VkInstance instance, const cha
         return (void*) vkGetPhysicalDeviceProperties;
     if (!strcmp(funcName, "vkGetPhysicalDeviceFeatures"))
         return (void*) vkGetPhysicalDeviceFeatures;
-    if (!strcmp(funcName, "vkGetPhysicalDeviceFormatInfo"))
-        return (void*) vkGetPhysicalDeviceFormatInfo;
+    if (!strcmp(funcName, "vkGetPhysicalDeviceFormatProperties"))
+        return (void*) vkGetPhysicalDeviceFormatProperties;
     if (!strcmp(funcName, "vkGetPhysicalDeviceLimits"))
         return (void*) vkGetPhysicalDeviceLimits;
     if (!strcmp(funcName, "vkGetGlobalLayerProperties"))
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 08d3b60d..43432d0a 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -39,8 +39,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkEnumeratePhysicalDevices;
     if (!strcmp(name, "GetPhysicalDeviceProperties"))
         return (void*) vkGetPhysicalDeviceProperties;
-    if (!strcmp(name, "GetPhysicalDevicePerformance"))
-        return (void*) vkGetPhysicalDevicePerformance;
     if (!strcmp(name, "GetPhysicalDeviceQueueCount"))
         return (void*) vkGetPhysicalDeviceQueueCount;
     if (!strcmp(name, "GetPhysicalDeviceQueueProperties"))
@@ -49,8 +47,8 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkGetPhysicalDeviceMemoryProperties;
     if (!strcmp(name, "GetPhysicalDeviceFeatures"))
         return (void*) vkGetPhysicalDeviceFeatures;
-    if (!strcmp(name, "GetPhysicalDeviceFormatInfo"))
-        return (void*) vkGetPhysicalDeviceFormatInfo;
+    if (!strcmp(name, "GetPhysicalDeviceFormatProperties"))
+        return (void*) vkGetPhysicalDeviceFormatProperties;
     if (!strcmp(name, "GetPhysicalDeviceLimits"))
         return (void*) vkGetPhysicalDeviceLimits;
     if (!strcmp(name, "GetInstanceProcAddr"))
@@ -349,12 +347,10 @@ static inline void *loader_non_passthrough_gpa(const char *name)
         return (void*) vkEnumeratePhysicalDevices;
     if (!strcmp(name, "GetPhysicalDeviceFeatures"))
         return (void*) vkGetPhysicalDeviceFeatures;
-    if (!strcmp(name, "GetPhysicalDeviceFormatInfo"))
-        return (void*) vkGetPhysicalDeviceFormatInfo;
+    if (!strcmp(name, "GetPhysicalDeviceFormatProperties"))
+        return (void*) vkGetPhysicalDeviceFormatProperties;
     if (!strcmp(name, "GetPhysicalDeviceLimits"))
         return (void*) vkGetPhysicalDeviceLimits;
-    if (!strcmp(name, "GetPhysicalDevicePerformance"))
-        return (void*) vkGetPhysicalDevicePerformance;
     if (!strcmp(name, "GetPhysicalDeviceQueueCount"))
         return (void*) vkGetPhysicalDeviceQueueCount;
     if (!strcmp(name, "GetPhysicalDeviceQueueProperties"))
diff --git a/loader/loader.c b/loader/loader.c
index 07d0416c..12e2fe0f 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -89,10 +89,9 @@ const VkLayerInstanceDispatchTable instance_disp = {
     .DestroyInstance = loader_DestroyInstance,
     .EnumeratePhysicalDevices = loader_EnumeratePhysicalDevices,
     .GetPhysicalDeviceFeatures = loader_GetPhysicalDeviceFeatures,
-    .GetPhysicalDeviceFormatInfo = loader_GetPhysicalDeviceFormatInfo,
+    .GetPhysicalDeviceFormatProperties = loader_GetPhysicalDeviceFormatProperties,
     .GetPhysicalDeviceLimits = loader_GetPhysicalDeviceLimits,
     .GetPhysicalDeviceProperties = loader_GetPhysicalDeviceProperties,
-    .GetPhysicalDevicePerformance = loader_GetPhysicalDevicePerformance,
     .GetPhysicalDeviceQueueCount = loader_GetPhysicalDeviceQueueCount,
     .GetPhysicalDeviceQueueProperties = loader_GetPhysicalDeviceQueueProperties,
     .GetPhysicalDeviceMemoryProperties = loader_GetPhysicalDeviceMemoryProperties,
@@ -1079,12 +1078,11 @@ static void loader_icd_init_entrys(struct loader_icd *icd,
     LOOKUP(DestroyInstance);
     LOOKUP(EnumeratePhysicalDevices);
     LOOKUP(GetPhysicalDeviceFeatures);
-    LOOKUP(GetPhysicalDeviceFormatInfo);
+    LOOKUP(GetPhysicalDeviceFormatProperties);
     LOOKUP(GetPhysicalDeviceLimits);
     LOOKUP(CreateDevice);
     LOOKUP(GetPhysicalDeviceProperties);
     LOOKUP(GetPhysicalDeviceMemoryProperties);
-    LOOKUP(GetPhysicalDevicePerformance);
     LOOKUP(GetPhysicalDeviceQueueCount);
     LOOKUP(GetPhysicalDeviceQueueProperties);
     LOOKUP(GetPhysicalDeviceExtensionProperties);
@@ -2633,20 +2631,6 @@ VkResult loader_GetPhysicalDeviceProperties(
     return res;
 }
 
-VkResult loader_GetPhysicalDevicePerformance(
-        VkPhysicalDevice                        gpu,
-        VkPhysicalDevicePerformance*            pPerformance)
-{
-    uint32_t gpu_index;
-    struct loader_icd *icd = loader_get_icd(gpu, &gpu_index);
-    VkResult res = VK_ERROR_INITIALIZATION_FAILED;
-
-    if (icd->GetPhysicalDevicePerformance)
-        res = icd->GetPhysicalDevicePerformance(gpu, pPerformance);
-
-    return res;
-}
-
 VkResult loader_GetPhysicalDeviceQueueCount(
         VkPhysicalDevice                        gpu,
         uint32_t*                               pCount)
@@ -2704,7 +2688,7 @@ VkResult loader_GetPhysicalDeviceFeatures(
     return res;
 }
 
-VkResult loader_GetPhysicalDeviceFormatInfo(
+VkResult loader_GetPhysicalDeviceFormatProperties(
         VkPhysicalDevice                        physicalDevice,
         VkFormat                                format,
         VkFormatProperties*                     pFormatInfo)
@@ -2713,8 +2697,8 @@ VkResult loader_GetPhysicalDeviceFormatInfo(
     struct loader_icd *icd = loader_get_icd(physicalDevice, &gpu_index);
     VkResult res = VK_ERROR_INITIALIZATION_FAILED;
 
-    if (icd->GetPhysicalDeviceFormatInfo)
-        res = icd->GetPhysicalDeviceFormatInfo(physicalDevice, format, pFormatInfo);
+    if (icd->GetPhysicalDeviceFormatProperties)
+        res = icd->GetPhysicalDeviceFormatProperties(physicalDevice, format, pFormatInfo);
 
     return res;
 }
diff --git a/loader/loader.h b/loader/loader.h
index d5395d6e..1714106f 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -144,11 +144,10 @@ struct loader_icd {
     PFN_vkDestroyInstance DestroyInstance;
     PFN_vkEnumeratePhysicalDevices EnumeratePhysicalDevices;
     PFN_vkGetPhysicalDeviceFeatures GetPhysicalDeviceFeatures;
-    PFN_vkGetPhysicalDeviceFormatInfo GetPhysicalDeviceFormatInfo;
+    PFN_vkGetPhysicalDeviceFormatProperties GetPhysicalDeviceFormatProperties;
     PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits;
     PFN_vkCreateDevice CreateDevice;
     PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties;
-    PFN_vkGetPhysicalDevicePerformance GetPhysicalDevicePerformance;
     PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount;
     PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties;
     PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties;
@@ -362,7 +361,7 @@ VkResult loader_GetPhysicalDeviceFeatures(
         VkPhysicalDevice                        physicalDevice,
         VkPhysicalDeviceFeatures*               pFeatures);
 
-VkResult loader_GetPhysicalDeviceFormatInfo(
+VkResult loader_GetPhysicalDeviceFormatProperties(
         VkPhysicalDevice                        physicalDevice,
         VkFormat                                format,
         VkFormatProperties*                     pFormatInfo);
@@ -385,10 +384,6 @@ VkResult loader_GetPhysicalDeviceProperties (
         VkPhysicalDevice physicalDevice,
         VkPhysicalDeviceProperties* pProperties);
 
-VkResult loader_GetPhysicalDevicePerformance (
-        VkPhysicalDevice physicalDevice,
-        VkPhysicalDevicePerformance* pPerformance);
-
 VkResult loader_GetPhysicalDeviceExtensionProperties (VkPhysicalDevice physicalDevice,
         const char *pLayerName, uint32_t *pCount,
         VkExtensionProperties* pProperties);
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 9bcd1296..bbb83e07 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -467,10 +467,9 @@ static inline void loader_init_instance_core_dispatch_table(VkLayerInstanceDispa
     table->DestroyInstance = (PFN_vkDestroyInstance) gpa(inst, "vkDestroyInstance");
     table->EnumeratePhysicalDevices = (PFN_vkEnumeratePhysicalDevices) gpa(inst, "vkEnumeratePhysicalDevices");
     table->GetPhysicalDeviceFeatures = (PFN_vkGetPhysicalDeviceFeatures) gpa(inst, "vkGetPhysicalDeviceFeatures");
-    table->GetPhysicalDeviceFormatInfo = (PFN_vkGetPhysicalDeviceFormatInfo) gpa(inst, "vkGetPhysicalDeviceFormatInfo");
+    table->GetPhysicalDeviceFormatProperties = (PFN_vkGetPhysicalDeviceFormatProperties) gpa(inst, "vkGetPhysicalDeviceFormatProperties");
     table->GetPhysicalDeviceLimits = (PFN_vkGetPhysicalDeviceLimits) gpa(inst, "vkGetPhysicalDeviceLimits");
     table->GetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties) gpa(inst, "vkGetPhysicalDeviceProperties");
-    table->GetPhysicalDevicePerformance = (PFN_vkGetPhysicalDevicePerformance) gpa(inst, "vkGetPhysicalDevicePerformance");
     table->GetPhysicalDeviceQueueCount = (PFN_vkGetPhysicalDeviceQueueCount) gpa(inst, "vkGetPhysicalDeviceQueueCount");
     table->GetPhysicalDeviceQueueProperties = (PFN_vkGetPhysicalDeviceQueueProperties) gpa(inst, "vkGetPhysicalDeviceQueueProperties");
     table->GetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties) gpa(inst, "vkGetPhysicalDeviceMemoryProperties");
@@ -504,16 +503,14 @@ static inline void *loader_lookup_instance_dispatch_table(
         return (void *) table->EnumeratePhysicalDevices;
     if (!strcmp(name, "GetPhysicalDeviceFeatures"))
         return (void *) table->GetPhysicalDeviceFeatures;
-    if (!strcmp(name, "GetPhysicalDeviceFormatInfo"))
-        return (void *) table->GetPhysicalDeviceFormatInfo;
+    if (!strcmp(name, "GetPhysicalDeviceFormatProperties"))
+        return (void *) table->GetPhysicalDeviceFormatProperties;
     if (!strcmp(name, "GetPhysicalDeviceLimits"))
         return (void *) table->GetPhysicalDeviceLimits;
     if (!strcmp(name, "GetPhysicalDeviceSparseImageFormatProperties"))
         return (void *) table->GetPhysicalDeviceSparseImageFormatProperties;
     if (!strcmp(name, "GetPhysicalDeviceProperties"))
         return (void *) table->GetPhysicalDeviceProperties;
-    if (!strcmp(name, "GetPhysicalDevicePerformance"))
-        return (void *) table->GetPhysicalDevicePerformance;
     if (!strcmp(name, "GetPhysicalDeviceQueueCount"))
         return (void *) table->GetPhysicalDeviceQueueCount;
     if (!strcmp(name, "GetPhysicalDeviceQueueProperties"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 183062c4..358ab23d 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -182,18 +182,6 @@ LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties(
     return res;
 }
 
-LOADER_EXPORT VkResult VKAPI vkGetPhysicalDevicePerformance(
-                                            VkPhysicalDevice gpu,
-                                            VkPhysicalDevicePerformance* pPerformance)
-{
-    const VkLayerInstanceDispatchTable *disp;
-    VkResult res;
-
-    disp = loader_get_instance_dispatch(gpu);
-    res = disp->GetPhysicalDevicePerformance(gpu, pPerformance);
-    return res;
-}
-
 LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueCount(
                                             VkPhysicalDevice gpu,
                                             uint32_t* pCount)
@@ -243,7 +231,7 @@ LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFeatures(
     return res;
 }
 
-LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatInfo(
+LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatProperties(
                                             VkPhysicalDevice gpu,
                                             VkFormat format,
                                             VkFormatProperties *pFormatInfo)
@@ -252,7 +240,7 @@ LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatInfo(
     VkResult res;
 
     disp = loader_get_instance_dispatch(gpu);
-    res = disp->GetPhysicalDeviceFormatInfo(gpu, format, pFormatInfo);
+    res = disp->GetPhysicalDeviceFormatProperties(gpu, format, pFormatInfo);
     return res;
 }
 
diff --git a/vulkan.py b/vulkan.py
index 8db4334b..df9a7781 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -232,7 +232,7 @@ core = Extension(
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("VkPhysicalDeviceFeatures*", "pFeatures")]),
 
-        Proto("VkResult", "GetPhysicalDeviceFormatInfo",
+        Proto("VkResult", "GetPhysicalDeviceFormatProperties",
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("VkFormat", "format"),
              Param("VkFormatProperties*", "pFormatInfo")]),
@@ -261,10 +261,6 @@ core = Extension(
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("VkPhysicalDeviceProperties*", "pProperties")]),
 
-        Proto("VkResult", "GetPhysicalDevicePerformance",
-            [Param("VkPhysicalDevice", "physicalDevice"),
-             Param("VkPhysicalDevicePerformance*", "pPerformance")]),
-
         Proto("VkResult", "GetPhysicalDeviceQueueCount",
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("uint32_t*", "pCount")]),