diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-03-03 12:03:58 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-03-03 12:03:58 -0700 |
| commit | ac5ff94a099f4278aa710c71904233b578f79c65 (patch) | |
| tree | 76d751162f68b376773769a7e9d1aad7672ff53c /layers/device_limits.cpp | |
| parent | 1e69501fc7592eedd390be246c0f06485ee67cec (diff) | |
| download | usermoji-ac5ff94a099f4278aa710c71904233b578f79c65.tar.xz | |
misc: Remove lunarg_debug_marker extension
This device extensions was not completely supported in any layer. It had partial
support (intercept) in draw_state and device_limits. This extension is being
changed and has a formal proposal in Khronos as debug_marker_ext. Removing
the existing extension since it is deprecated; once the debug_marker_ext gets
registered by Khronos, layers might want to start using the ObjectTag/ObjectName
commands to supplement error report messages in debug_report_ext. Since
debug_report_ext might get changed as part of Khronos review, don't add it yet.
Diffstat (limited to 'layers/device_limits.cpp')
| -rw-r--r-- | layers/device_limits.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index ddba925a..5d630fd0 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -45,26 +45,19 @@ #include "device_limits.h" #include "vulkan/vk_layer.h" #include "vk_layer_config.h" -#include "vulkan/vk_debug_marker_layer.h" #include "vk_enum_validate_helper.h" #include "vk_layer_table.h" -#include "vk_layer_debug_marker_table.h" #include "vk_layer_data.h" #include "vk_layer_logging.h" #include "vk_layer_extension_utils.h" #include "vk_layer_utils.h" -struct devExts { - bool debug_marker_enabled; -}; - // This struct will be stored in a map hashed by the dispatchable object struct layer_data { debug_report_data *report_data; std::vector<VkDebugReportCallbackEXT> logging_callback; VkLayerDispatchTable *device_dispatch_table; VkLayerInstanceDispatchTable *instance_dispatch_table; - devExts device_extensions; // Track state of each instance unique_ptr<INSTANCE_STATE> instanceState; unique_ptr<PHYSICAL_DEVICE_STATE> physicalDeviceState; @@ -81,7 +74,6 @@ struct layer_data { report_data(nullptr), device_dispatch_table(nullptr), instance_dispatch_table(nullptr), - device_extensions(), instanceState(nullptr), physicalDeviceState(nullptr), actualPhysicalDeviceFeatures(), @@ -407,22 +399,6 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkCmdSetScissor( } } -static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo, VkDevice device) -{ - uint32_t i; - layer_data *my_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map); - my_data->device_extensions.debug_marker_enabled = false; - - for (i = 0; i < pCreateInfo->enabledExtensionCount; i++) { - if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], DEBUG_MARKER_EXTENSION_NAME) == 0) { - /* Found a matching extension name, mark it enabled and init dispatch table*/ - initDebugMarkerTable(device); - my_data->device_extensions.debug_marker_enabled = true; - } - - } -} - // Verify that features have been queried and verify that requested features are available static VkBool32 validate_features_request(layer_data *phy_dev_data) { @@ -509,7 +485,6 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice g layer_init_device_dispatch_table(*pDevice, my_device_data->device_dispatch_table, fpGetDeviceProcAddr); my_device_data->report_data = layer_debug_report_create_device(my_instance_data->report_data, *pDevice); my_device_data->physicalDevice = gpu; - createDeviceRegisterExtensions(pCreateInfo, *pDevice); // Get physical device properties for this device phy_dev_data->instance_dispatch_table->GetPhysicalDeviceProperties(gpu, &(phy_dev_data->physDevPropertyMap[*pDevice])); @@ -522,7 +497,6 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyDevice(VkDevice device, cons dispatch_key key = get_dispatch_key(device); layer_data *my_device_data = get_my_data_ptr(key, layer_data_map); my_device_data->device_dispatch_table->DestroyDevice(device, pAllocator); - tableDebugMarkerMap.erase(key); delete my_device_data->device_dispatch_table; layer_data_map.erase(key); } |
