vulkan.h: V117 -- Remove Atomic Counters, Bug #14081

10 files changed, 0 insertions, 358 deletions

diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c
index 44377205..eaac2d1e 100644
--- a/demos/vulkaninfo.c
+++ b/demos/vulkaninfo.c
@@ -687,7 +687,6 @@ static void app_gpu_dump_queue_props(const struct app_gpu *gpu, uint32_t id)
             (props->queueFlags & VK_QUEUE_DMA_BIT)      ? 'D' : '.',
             (props->queueFlags & VK_QUEUE_EXTENDED_BIT) ? 'X' : '.');
     printf("\tqueueCount = %u\n",           props->queueCount);
-    printf("\tmaxAtomicCounters = %u\n",    props->maxAtomicCounters);
     printf("\tsupportsTimestamps = %u\n",   props->supportsTimestamps);
 }
 
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 7bb40203..1f99a1d4 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -759,39 +759,6 @@ ICD_EXPORT VkResult VKAPI vkResetCommandBuffer(
     return VK_SUCCESS;
 }
 
-ICD_EXPORT void VKAPI vkCmdInitAtomicCounters(
-    VkCmdBuffer                              cmdBuffer,
-    VkPipelineBindPoint                     pipelineBindPoint,
-    uint32_t                                    startCounter,
-    uint32_t                                    counterCount,
-    const uint32_t*                             pData)
-{
-    NULLDRV_LOG_FUNC;
-}
-
-ICD_EXPORT void VKAPI vkCmdLoadAtomicCounters(
-    VkCmdBuffer                              cmdBuffer,
-    VkPipelineBindPoint                     pipelineBindPoint,
-    uint32_t                                    startCounter,
-    uint32_t                                    counterCount,
-    VkBuffer                                  srcBuffer,
-    VkDeviceSize                                srcOffset)
-{
-    NULLDRV_LOG_FUNC;
-}
-
-ICD_EXPORT void VKAPI vkCmdSaveAtomicCounters(
-    VkCmdBuffer                              cmdBuffer,
-    VkPipelineBindPoint                     pipelineBindPoint,
-    uint32_t                                    startCounter,
-    uint32_t                                    counterCount,
-    VkBuffer                                  destBuffer,
-    VkDeviceSize                                destOffset)
-{
-    NULLDRV_LOG_FUNC;
-}
-
-
 static const VkFormat nulldrv_presentable_formats[] = {
     VK_FORMAT_B8G8R8A8_UNORM,
 };
@@ -1441,7 +1408,6 @@ ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueProperties(
  {
     pProperties->queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_SPARSE_MEMMGR_BIT;
     pProperties->queueCount = 1;
-    pProperties->maxAtomicCounters = 1;
     pProperties->supportsTimestamps = false;
 
     return VK_SUCCESS;
diff --git a/include/vkLayer.h b/include/vkLayer.h
index 154472c1..a1104db2 100644
--- a/include/vkLayer.h
+++ b/include/vkLayer.h
@@ -118,9 +118,6 @@ typedef struct VkLayerDispatchTable_
     PFN_vkCmdResetQueryPool CmdResetQueryPool;
     PFN_vkCmdWriteTimestamp CmdWriteTimestamp;
     PFN_vkCmdCopyQueryPoolResults CmdCopyQueryPoolResults;
-    PFN_vkCmdInitAtomicCounters CmdInitAtomicCounters;
-    PFN_vkCmdLoadAtomicCounters CmdLoadAtomicCounters;
-    PFN_vkCmdSaveAtomicCounters CmdSaveAtomicCounters;
     PFN_vkCreateFramebuffer CreateFramebuffer;
     PFN_vkCreateRenderPass CreateRenderPass;
     PFN_vkCmdBeginRenderPass CmdBeginRenderPass;
diff --git a/include/vulkan.h b/include/vulkan.h
index f5b52d5c..8998cd07 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1304,7 +1304,6 @@ typedef struct VkPhysicalDeviceQueueProperties_
 {
     VkQueueFlags                                queueFlags;                 // Queue flags
     uint32_t                                    queueCount;
-    uint32_t                                    maxAtomicCounters;
     bool32_t                                    supportsTimestamps;
 } VkPhysicalDeviceQueueProperties;
 
@@ -2135,9 +2134,6 @@ typedef void     (VKAPI *PFN_vkCmdEndQuery)(VkCmdBuffer cmdBuffer, VkQueryPool q
 typedef void     (VKAPI *PFN_vkCmdResetQueryPool)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount);
 typedef void     (VKAPI *PFN_vkCmdWriteTimestamp)(VkCmdBuffer cmdBuffer, VkTimestampType timestampType, VkBuffer destBuffer, VkDeviceSize destOffset);
 typedef void     (VKAPI *PFN_vkCmdCopyQueryPoolResults)(VkCmdBuffer cmdBuffer, VkQueryPool queryPool, uint32_t startQuery, uint32_t queryCount, VkBuffer destBuffer, VkDeviceSize destOffset, VkDeviceSize destStride, VkQueryResultFlags flags);
-typedef void     (VKAPI *PFN_vkCmdInitAtomicCounters)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData);
-typedef void     (VKAPI *PFN_vkCmdLoadAtomicCounters)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, VkBuffer srcBuffer, VkDeviceSize srcOffset);
-typedef void     (VKAPI *PFN_vkCmdSaveAtomicCounters)(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, VkBuffer destBuffer, VkDeviceSize destOffset);
 typedef VkResult (VKAPI *PFN_vkCreateFramebuffer)(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer);
 typedef VkResult (VKAPI *PFN_vkCreateRenderPass)(VkDevice device, const VkRenderPassCreateInfo* pCreateInfo, VkRenderPass* pRenderPass);
 typedef void     (VKAPI *PFN_vkCmdBeginRenderPass)(VkCmdBuffer cmdBuffer, const VkRenderPassBegin* pRenderPassBegin);
@@ -2788,29 +2784,6 @@ void VKAPI vkCmdCopyQueryPoolResults(
     VkDeviceSize                                destStride,
     VkQueryResultFlags                          flags);
 
-void VKAPI vkCmdInitAtomicCounters(
-    VkCmdBuffer                                 cmdBuffer,
-    VkPipelineBindPoint                         pipelineBindPoint,
-    uint32_t                                    startCounter,
-    uint32_t                                    counterCount,
-    const uint32_t*                             pData);
-
-void VKAPI vkCmdLoadAtomicCounters(
-    VkCmdBuffer                                 cmdBuffer,
-    VkPipelineBindPoint                         pipelineBindPoint,
-    uint32_t                                    startCounter,
-    uint32_t                                    counterCount,
-    VkBuffer                                    srcBuffer,
-    VkDeviceSize                                srcOffset);
-
-void VKAPI vkCmdSaveAtomicCounters(
-    VkCmdBuffer                                 cmdBuffer,
-    VkPipelineBindPoint                         pipelineBindPoint,
-    uint32_t                                    startCounter,
-    uint32_t                                    counterCount,
-    VkBuffer                                    destBuffer,
-    VkDeviceSize                                destOffset);
-
 VkResult VKAPI vkCreateFramebuffer(
     VkDevice                                    device,
     const VkFramebufferCreateInfo*              pCreateInfo,
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 48b65391..2d05e8db 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2658,48 +2658,6 @@ VK_LAYER_EXPORT void VKAPI vkCmdWriteTimestamp(VkCmdBuffer cmdBuffer, VkTimestam
     }
 }
 
-VK_LAYER_EXPORT void VKAPI vkCmdInitAtomicCounters(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData)
-{
-    GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
-    if (pCB) {
-        if (pCB->state == CB_UPDATE_ACTIVE) {
-            updateCBTracking(cmdBuffer);
-            addCmd(pCB, CMD_INITATOMICCOUNTERS);
-            get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, pData);
-        } else {
-            report_error_no_cb_begin(cmdBuffer, "vkCmdInitAtomicCounters()");
-        }
-    }
-}
-
-VK_LAYER_EXPORT void VKAPI vkCmdLoadAtomicCounters(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, VkBuffer srcBuffer, VkDeviceSize srcOffset)
-{
-    GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
-    if (pCB) {
-        if (pCB->state == CB_UPDATE_ACTIVE) {
-            updateCBTracking(cmdBuffer);
-            addCmd(pCB, CMD_LOADATOMICCOUNTERS);
-            get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcBuffer, srcOffset);
-        } else {
-            report_error_no_cb_begin(cmdBuffer, "vkCmdLoadAtomicCounters()");
-        }
-    }
-}
-
-VK_LAYER_EXPORT void VKAPI vkCmdSaveAtomicCounters(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, VkBuffer destBuffer, VkDeviceSize destOffset)
-{
-    GLOBAL_CB_NODE* pCB = getCBNode(cmdBuffer);
-    if (pCB) {
-        if (pCB->state == CB_UPDATE_ACTIVE) {
-            updateCBTracking(cmdBuffer);
-            addCmd(pCB, CMD_SAVEATOMICCOUNTERS);
-            get_dispatch_table(draw_state_device_table_map, cmdBuffer)->CmdSaveAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, destBuffer, destOffset);
-        } else {
-            report_error_no_cb_begin(cmdBuffer, "vkCmdSaveAtomicCounters()");
-        }
-    }
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer)
 {
     VkResult result = get_dispatch_table(draw_state_device_table_map, device)->CreateFramebuffer(device, pCreateInfo, pFramebuffer);
@@ -3018,12 +2976,6 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(VkDevice dev, const char* funcNa
         return (void*) vkCmdResetQueryPool;
     if (!strcmp(funcName, "vkCmdWriteTimestamp"))
         return (void*) vkCmdWriteTimestamp;
-    if (!strcmp(funcName, "vkCmdInitAtomicCounters"))
-        return (void*) vkCmdInitAtomicCounters;
-    if (!strcmp(funcName, "vkCmdLoadAtomicCounters"))
-        return (void*) vkCmdLoadAtomicCounters;
-    if (!strcmp(funcName, "vkCmdSaveAtomicCounters"))
-        return (void*) vkCmdSaveAtomicCounters;
     if (!strcmp(funcName, "vkCreateFramebuffer"))
         return (void*) vkCreateFramebuffer;
     if (!strcmp(funcName, "vkCreateRenderPass"))
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index f77bd47d..2e0a755a 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -9134,180 +9134,6 @@ VK_LAYER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(
     PostCmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, destStride, flags);
 }
 
-void PreCmdInitAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    const uint32_t* pData)
-{
-    if(cmdBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdInitAtomicCounters parameter, VkCmdBuffer cmdBuffer, is null pointer");
-        return;
-    }
-
-    if(pData == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdInitAtomicCounters parameter, const uint32_t* pData, is null pointer");
-        return;
-    }
-}
-
-void PostCmdInitAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    VkPipelineBindPoint pipelineBindPoint,
-    uint32_t startCounter,
-    uint32_t counterCount)
-{
-    if(cmdBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdInitAtomicCounters parameter, VkCmdBuffer cmdBuffer, is null pointer");
-        return;
-    }
-
-    if(pipelineBindPoint < VK_PIPELINE_BIND_POINT_BEGIN_RANGE ||
-        pipelineBindPoint > VK_PIPELINE_BIND_POINT_END_RANGE)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdInitAtomicCounters parameter, VkPipelineBindPoint pipelineBindPoint, is unrecognized enumerator");
-        return;
-    }
-
-
-}
-
-VK_LAYER_EXPORT void VKAPI vkCmdInitAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    VkPipelineBindPoint pipelineBindPoint,
-    uint32_t startCounter,
-    uint32_t counterCount,
-    const uint32_t* pData)
-{
-    PreCmdInitAtomicCounters(cmdBuffer, pData);
-    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, pData);
-
-    PostCmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount);
-}
-
-void PreCmdLoadAtomicCounters(
-    VkCmdBuffer cmdBuffer)
-{
-    if(cmdBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdLoadAtomicCounters parameter, VkCmdBuffer cmdBuffer, is null pointer");
-        return;
-    }
-}
-
-void PostCmdLoadAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    VkPipelineBindPoint pipelineBindPoint,
-    uint32_t startCounter,
-    uint32_t counterCount,
-    VkBuffer srcBuffer,
-    VkDeviceSize srcOffset)
-{
-    if(cmdBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdLoadAtomicCounters parameter, VkCmdBuffer cmdBuffer, is null pointer");
-        return;
-    }
-
-    if(pipelineBindPoint < VK_PIPELINE_BIND_POINT_BEGIN_RANGE ||
-        pipelineBindPoint > VK_PIPELINE_BIND_POINT_END_RANGE)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdLoadAtomicCounters parameter, VkPipelineBindPoint pipelineBindPoint, is unrecognized enumerator");
-        return;
-    }
-
-
-
-    if(srcBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdLoadAtomicCounters parameter, VkBuffer srcBuffer, is null pointer");
-        return;
-    }
-
-}
-
-VK_LAYER_EXPORT void VKAPI vkCmdLoadAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    VkPipelineBindPoint pipelineBindPoint,
-    uint32_t startCounter,
-    uint32_t counterCount,
-    VkBuffer srcBuffer,
-    VkDeviceSize srcOffset)
-{
-    PreCmdLoadAtomicCounters(cmdBuffer);
-    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcBuffer, srcOffset);
-
-    PostCmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcBuffer, srcOffset);
-}
-
-void PreCmdSaveAtomicCounters(
-    VkCmdBuffer cmdBuffer)
-{
-    if(cmdBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdSaveAtomicCounters parameter, VkCmdBuffer cmdBuffer, is null pointer");
-        return;
-    }
-}
-
-void PostCmdSaveAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    VkPipelineBindPoint pipelineBindPoint,
-    uint32_t startCounter,
-    uint32_t counterCount,
-    VkBuffer destBuffer,
-    VkDeviceSize destOffset)
-{
-    if(cmdBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdSaveAtomicCounters parameter, VkCmdBuffer cmdBuffer, is null pointer");
-        return;
-    }
-
-    if(pipelineBindPoint < VK_PIPELINE_BIND_POINT_BEGIN_RANGE ||
-        pipelineBindPoint > VK_PIPELINE_BIND_POINT_END_RANGE)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdSaveAtomicCounters parameter, VkPipelineBindPoint pipelineBindPoint, is unrecognized enumerator");
-        return;
-    }
-
-
-
-    if(destBuffer == nullptr)
-    {
-        log_msg(mdd(cmdBuffer), VK_DBG_REPORT_WARN_BIT, (VkObjectType)0, NULL, 0, 1, "PARAMCHECK",
-        "vkCmdSaveAtomicCounters parameter, VkBuffer destBuffer, is null pointer");
-        return;
-    }
-
-}
-
-VK_LAYER_EXPORT void VKAPI vkCmdSaveAtomicCounters(
-    VkCmdBuffer cmdBuffer,
-    VkPipelineBindPoint pipelineBindPoint,
-    uint32_t startCounter,
-    uint32_t counterCount,
-    VkBuffer destBuffer,
-    VkDeviceSize destOffset)
-{
-    PreCmdSaveAtomicCounters(cmdBuffer);
-    get_dispatch_table(pc_device_table_map, cmdBuffer)->CmdSaveAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, destBuffer, destOffset);
-
-    PostCmdSaveAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, destBuffer, destOffset);
-}
-
 void PreCreateFramebuffer(
     VkDevice device,
     const VkFramebufferCreateInfo* pCreateInfo)
@@ -9864,12 +9690,6 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(VkDevice device, const char* fun
         return (void*) vkCmdWriteTimestamp;
     if (!strcmp(funcName, "vkCmdCopyQueryPoolResults"))
         return (void*) vkCmdCopyQueryPoolResults;
-    if (!strcmp(funcName, "vkCmdInitAtomicCounters"))
-        return (void*) vkCmdInitAtomicCounters;
-    if (!strcmp(funcName, "vkCmdLoadAtomicCounters"))
-        return (void*) vkCmdLoadAtomicCounters;
-    if (!strcmp(funcName, "vkCmdSaveAtomicCounters"))
-        return (void*) vkCmdSaveAtomicCounters;
     if (!strcmp(funcName, "vkCreateFramebuffer"))
         return (void*) vkCreateFramebuffer;
     if (!strcmp(funcName, "vkCreateRenderPass"))
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 02e33416..1ead95c7 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -245,12 +245,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkCmdWriteTimestamp;
     if (!strcmp(name, "CmdCopyQueryPoolResults"))
         return (void*) vkCmdCopyQueryPoolResults;
-    if (!strcmp(name, "CmdInitAtomicCounters"))
-        return (void*) vkCmdInitAtomicCounters;
-    if (!strcmp(name, "CmdLoadAtomicCounters"))
-        return (void*) vkCmdLoadAtomicCounters;
-    if (!strcmp(name, "CmdSaveAtomicCounters"))
-        return (void*) vkCmdSaveAtomicCounters;
     if (!strcmp(name, "CreateFramebuffer"))
         return (void*) vkCreateFramebuffer;
     if (!strcmp(name, "CreateRenderPass"))
diff --git a/loader/table_ops.h b/loader/table_ops.h
index be5f691f..9a523f31 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -127,9 +127,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->CmdResetQueryPool = (PFN_vkCmdResetQueryPool) gpa(dev, "vkCmdResetQueryPool");
     table->CmdWriteTimestamp = (PFN_vkCmdWriteTimestamp) gpa(dev, "vkCmdWriteTimestamp");
     table->CmdCopyQueryPoolResults = (PFN_vkCmdCopyQueryPoolResults) gpa(dev, "vkCmdCopyQueryPoolResults");
-    table->CmdInitAtomicCounters = (PFN_vkCmdInitAtomicCounters) gpa(dev, "vkCmdInitAtomicCounters");
-    table->CmdLoadAtomicCounters = (PFN_vkCmdLoadAtomicCounters) gpa(dev, "vkCmdLoadAtomicCounters");
-    table->CmdSaveAtomicCounters = (PFN_vkCmdSaveAtomicCounters) gpa(dev, "vkCmdSaveAtomicCounters");
     table->CreateFramebuffer = (PFN_vkCreateFramebuffer) gpa(dev, "vkCreateFramebuffer");
     table->CreateRenderPass = (PFN_vkCreateRenderPass) gpa(dev, "vkCreateRenderPass");
     table->CmdBeginRenderPass = (PFN_vkCmdBeginRenderPass) gpa(dev, "vkCmdBeginRenderPass");
@@ -333,12 +330,6 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->CmdWriteTimestamp;
     if (!strcmp(name, "CmdCopyQueryPoolResults"))
         return (void *) table->CmdCopyQueryPoolResults;
-    if (!strcmp(name, "CmdInitAtomicCounters"))
-        return (void *) table->CmdInitAtomicCounters;
-    if (!strcmp(name, "CmdLoadAtomicCounters"))
-        return (void *) table->CmdLoadAtomicCounters;
-    if (!strcmp(name, "CmdSaveAtomicCounters"))
-        return (void *) table->CmdSaveAtomicCounters;
     if (!strcmp(name, "CreateFramebuffer"))
         return (void *) table->CreateFramebuffer;
     if (!strcmp(name, "CreateRenderPass"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 24d3a60b..5a47172f 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -1098,33 +1098,6 @@ LOADER_EXPORT void VKAPI vkCmdCopyQueryPoolResults(VkCmdBuffer cmdBuffer, VkQuer
     disp->CmdCopyQueryPoolResults(cmdBuffer, queryPool, startQuery, queryCount, destBuffer, destOffset, destStride, flags);
 }
 
-LOADER_EXPORT void VKAPI vkCmdInitAtomicCounters(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, const uint32_t* pData)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(cmdBuffer);
-
-    disp->CmdInitAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, pData);
-}
-
-LOADER_EXPORT void VKAPI vkCmdLoadAtomicCounters(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, VkBuffer srcBuffer, VkDeviceSize srcOffset)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(cmdBuffer);
-
-    disp->CmdLoadAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, srcBuffer, srcOffset);
-}
-
-LOADER_EXPORT void VKAPI vkCmdSaveAtomicCounters(VkCmdBuffer cmdBuffer, VkPipelineBindPoint pipelineBindPoint, uint32_t startCounter, uint32_t counterCount, VkBuffer destBuffer, VkDeviceSize destOffset)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(cmdBuffer);
-
-    disp->CmdSaveAtomicCounters(cmdBuffer, pipelineBindPoint, startCounter, counterCount, destBuffer, destOffset);
-}
-
 LOADER_EXPORT VkResult VKAPI vkCreateFramebuffer(VkDevice device, const VkFramebufferCreateInfo* pCreateInfo, VkFramebuffer* pFramebuffer)
 {
     const VkLayerDispatchTable *disp;
diff --git a/vulkan.py b/vulkan.py
index f2dbd5b4..5f468563 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -816,29 +816,6 @@ core = Extension(
              Param("VkDeviceSize", "destStride"),
              Param("VkFlags", "flags")]),
 
-        Proto("void", "CmdInitAtomicCounters",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkPipelineBindPoint", "pipelineBindPoint"),
-             Param("uint32_t", "startCounter"),
-             Param("uint32_t", "counterCount"),
-             Param("const uint32_t*", "pData")]),
-
-        Proto("void", "CmdLoadAtomicCounters",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkPipelineBindPoint", "pipelineBindPoint"),
-             Param("uint32_t", "startCounter"),
-             Param("uint32_t", "counterCount"),
-             Param("VkBuffer", "srcBuffer"),
-             Param("VkDeviceSize", "srcOffset")]),
-
-        Proto("void", "CmdSaveAtomicCounters",
-            [Param("VkCmdBuffer", "cmdBuffer"),
-             Param("VkPipelineBindPoint", "pipelineBindPoint"),
-             Param("uint32_t", "startCounter"),
-             Param("uint32_t", "counterCount"),
-             Param("VkBuffer", "destBuffer"),
-             Param("VkDeviceSize", "destOffset")]),
-
         Proto("VkResult", "CreateFramebuffer",
             [Param("VkDevice", "device"),
              Param("const VkFramebufferCreateInfo*", "pCreateInfo"),