layers: Remove object tracker extensions

2 files changed, 1 insertions, 96 deletions

diff --git a/layers/object_track.h b/layers/object_track.h
index d9cd0875..8dcffcf0 100644
--- a/layers/object_track.h
+++ b/layers/object_track.h
@@ -818,80 +818,3 @@ explicit_FreeMemory(
 
     return result;
 }
-
-
-// ObjectTracker Extensions
-
-uint64_t
-objTrackGetObjectsCount(
-    VkDevice device)
-{
-    return numTotalObjs;
-}
-
-VkResult
-objTrackGetObjects(
-    VkDevice       device,
-    uint64_t       objCount,
-    OBJTRACK_NODE *pObjNodeArray)
-{
-    // This bool flags if we're pulling all objs or just a single class of objs
-    // Check the count first thing
-    uint64_t maxObjCount = numTotalObjs;
-    if (objCount > maxObjCount) {
-        log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, device, 0, OBJTRACK_OBJCOUNT_MAX_EXCEEDED, "OBJTRACK",
-            "OBJ ERROR : Received objTrackGetObjects() request for %lu objs, but there are only %lu total objs", objCount, maxObjCount);
-        return VK_ERROR_INVALID_VALUE;
-    }
-    auto it = objMap.begin();
-    for (uint64_t i = 0; i < objCount; i++) {
-        if (objMap.end() == it) {
-            log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, device, 0, OBJTRACK_INTERNAL_ERROR, "OBJTRACK",
-                "OBJ INTERNAL ERROR : Ran out of objs! Should have %lu, but only copied %lu and not the requested %lu.", maxObjCount, i, objCount);
-            return VK_ERROR_UNKNOWN;
-        }
-        memcpy(&pObjNodeArray[i], it->second, sizeof(OBJTRACK_NODE));
-        ++it;
-    }
-    return VK_SUCCESS;
-}
-
-uint64_t
-objTrackGetObjectsOfTypeCount(
-    VkDevice     device,
-    VkObjectType type)
-{
-    return numObjs[type];
-}
-
-VkResult
-objTrackGetObjectsOfType(
-    VkDevice       device,
-    VkObjectType   type,
-    uint64_t       objCount,
-    OBJTRACK_NODE *pObjNodeArray)
-{
-    // Check the count first thing
-    uint64_t maxObjCount = numObjs[type];
-    if (objCount > maxObjCount) {
-        log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, device, 0, OBJTRACK_OBJCOUNT_MAX_EXCEEDED, "OBJTRACK",
-            "OBJ ERROR : Received objTrackGetObjects() request for %lu objs, but there are only %lu objs of type %s",
-            objCount, maxObjCount, string_VkObjectType(type));
-        return VK_ERROR_INVALID_VALUE;
-    }
-    auto it = objMap.begin();
-    for (uint64_t i = 0; i < objCount; i++) {
-        // Get next object of correct type
-        while ((objMap.end() != it) && (it->second->objType != type))
-            ++it;
-        if (objMap.end() == it) {
-            log_msg(mdd(device), VK_DBG_REPORT_ERROR_BIT, (VkObjectType) 0, device, 0, OBJTRACK_INTERNAL_ERROR, "OBJTRACK",
-                "OBJ INTERNAL ERROR : Ran out of %s objs! Should have %lu, but only copied %lu and not the requested %lu.",
-                string_VkObjectType(type), maxObjCount, i, objCount);
-            return VK_ERROR_UNKNOWN;
-        }
-        memcpy(&pObjNodeArray[i], it->second, sizeof(OBJTRACK_NODE));
-    }
-    return VK_SUCCESS;
-}
-
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 5b1ecb1d..be361a8a 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -237,21 +237,6 @@ class Subcommand(object):
 
     def _gen_layer_get_physical_device_extension_props(self, layer="Generic"):
         gpdep_body = []
-        if layer == 'ObjectTracker':
-            gpdep_body.append('%s' % self.lineinfo.get())
-            gpdep_body.append('#define DEVICE_EXTENSION_ARRAY_SIZE 1')
-            gpdep_body.append('static const VkExtensionProperties deviceExtensionProps[DEVICE_EXTENSION_ARRAY_SIZE] = {')
-            gpdep_body.append('    {')
-            gpdep_body.append('        "OBJTRACK_EXTENSIONS",' )
-            gpdep_body.append('        VK_MAKE_VERSION(0, 1, 0),')
-            gpdep_body.append('        VK_API_VERSION,')
-            gpdep_body.append('    }')
-            gpdep_body.append('};')
-            gpdep_body.append('VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pCount, VkExtensionProperties* pProperties)')
-            gpdep_body.append('{')
-            gpdep_body.append('    return util_GetExtensionProperties(DEVICE_EXTENSION_ARRAY_SIZE, deviceExtensionProps, pCount, pProperties);')
-            gpdep_body.append('}')
-            gpdep_body.append('')
         return "\n".join(gpdep_body)
 
     def _gen_layer_get_physical_device_layer_props(self, layer="Generic"):
@@ -1176,10 +1161,7 @@ class ObjectTrackerSubcommand(Subcommand):
         self.layer_name = "ObjectTracker"
         extensions=[('wsi_lunarg_enabled',
                     ['vkCreateSwapChainWSI', 'vkDestroySwapChainWSI',
-                     'vkGetSwapChainInfoWSI', 'vkQueuePresentWSI']),
-                    ('objtrack_extensions_enabled',
-                    ['objTrackGetObjectsCount', 'objTrackGetObjects',
-                     'objTrackGetObjectsOfTypeCount', 'objTrackGetObjectsOfType'])]
+                     'vkGetSwapChainInfoWSI', 'vkQueuePresentWSI'])]
         body = [self._generate_dispatch_entrypoints("VK_LAYER_EXPORT"),
                 self._generate_extensions(),
                 self._generate_layer_gpa_function(extensions,