From 7ce1eb5906dace0f2f9fa78706c92161ddcd4027 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Wed, 30 Dec 2015 08:16:12 -0700 Subject: layers: Rename Layer/library/json files for consistency Renamed layers from (for example) xxx_DrawState to xxx_draw_state Renamed JSON files Renamed libraries Renamed object_track.* to object_tracker.* Renamed apidump.h to api_dump.h Renamed screen_shot layer to screenshot Renamed APIDump layer settings file options to ApiDump Bug fixes here and there from prior renames --- layers/linux/VkLayer_api_dump.json | 11 +++++++++++ layers/linux/VkLayer_basic.json | 18 ++++++++++++++++++ layers/linux/VkLayer_basic_implicit.json | 20 ++++++++++++++++++++ layers/linux/VkLayer_device_limits.json | 17 +++++++++++++++++ layers/linux/VkLayer_draw_state.json | 24 ++++++++++++++++++++++++ layers/linux/VkLayer_generic.json | 11 +++++++++++ layers/linux/VkLayer_image.json | 17 +++++++++++++++++ layers/linux/VkLayer_mem_tracker.json | 17 +++++++++++++++++ layers/linux/VkLayer_multi.json | 25 +++++++++++++++++++++++++ layers/linux/VkLayer_object_tracker.json | 17 +++++++++++++++++ layers/linux/VkLayer_param_checker.json | 17 +++++++++++++++++ layers/linux/VkLayer_screenshot.json | 11 +++++++++++ layers/linux/VkLayer_swapchain.json | 17 +++++++++++++++++ layers/linux/VkLayer_threading.json | 17 +++++++++++++++++ layers/linux/api_dump.json | 11 ----------- layers/linux/basic.json | 18 ------------------ layers/linux/basic_implicit.json | 20 -------------------- layers/linux/device_limits.json | 17 ----------------- layers/linux/draw_state.json | 24 ------------------------ layers/linux/generic.json | 11 ----------- layers/linux/image.json | 17 ----------------- layers/linux/mem_tracker.json | 17 ----------------- layers/linux/multi.json | 25 ------------------------- layers/linux/object_tracker.json | 17 ----------------- layers/linux/param_checker.json | 17 ----------------- layers/linux/screenshot.json | 11 ----------- layers/linux/swapchain.json | 17 ----------------- layers/linux/threading.json | 17 ----------------- 28 files changed, 239 insertions(+), 239 deletions(-) create mode 100644 layers/linux/VkLayer_api_dump.json create mode 100644 layers/linux/VkLayer_basic.json create mode 100644 layers/linux/VkLayer_basic_implicit.json create mode 100644 layers/linux/VkLayer_device_limits.json create mode 100644 layers/linux/VkLayer_draw_state.json create mode 100644 layers/linux/VkLayer_generic.json create mode 100644 layers/linux/VkLayer_image.json create mode 100644 layers/linux/VkLayer_mem_tracker.json create mode 100644 layers/linux/VkLayer_multi.json create mode 100644 layers/linux/VkLayer_object_tracker.json create mode 100644 layers/linux/VkLayer_param_checker.json create mode 100644 layers/linux/VkLayer_screenshot.json create mode 100644 layers/linux/VkLayer_swapchain.json create mode 100644 layers/linux/VkLayer_threading.json delete mode 100644 layers/linux/api_dump.json delete mode 100644 layers/linux/basic.json delete mode 100644 layers/linux/basic_implicit.json delete mode 100644 layers/linux/device_limits.json delete mode 100644 layers/linux/draw_state.json delete mode 100644 layers/linux/generic.json delete mode 100644 layers/linux/image.json delete mode 100644 layers/linux/mem_tracker.json delete mode 100644 layers/linux/multi.json delete mode 100644 layers/linux/object_tracker.json delete mode 100644 layers/linux/param_checker.json delete mode 100644 layers/linux/screenshot.json delete mode 100644 layers/linux/swapchain.json delete mode 100644 layers/linux/threading.json (limited to 'layers/linux') diff --git a/layers/linux/VkLayer_api_dump.json b/layers/linux/VkLayer_api_dump.json new file mode 100644 index 00000000..adc2091b --- /dev/null +++ b/layers/linux/VkLayer_api_dump.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_api_dump", + "type": "GLOBAL", + "library_path": "./libVkLayer_api_dump.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG debug layer" + } +} diff --git a/layers/linux/VkLayer_basic.json b/layers/linux/VkLayer_basic.json new file mode 100644 index 00000000..227b1f4e --- /dev/null +++ b/layers/linux/VkLayer_basic.json @@ -0,0 +1,18 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_basic", + "type": "GLOBAL", + "library_path": "./libVkLayer_basic.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Sample Layer", + "device_extensions": [ + { + "name": "VK_LUNARG_LayerExtension1", + "spec_version": "0", + "entrypoints": ["vkLayerExtension1"] + } + ] + } +} diff --git a/layers/linux/VkLayer_basic_implicit.json b/layers/linux/VkLayer_basic_implicit.json new file mode 100644 index 00000000..396b4859 --- /dev/null +++ b/layers/linux/VkLayer_basic_implicit.json @@ -0,0 +1,20 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_basic", + "type": "GLOBAL", + "library_path": "/etc/vulkan/implicit_layer.d/libVkLayer_basic.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Sample Layer", + "device_extensions": [ + { + "name": "VK_LUNARG_LayerExtension1", + "spec_version": "0", + "entrypoints": ["vkLayerExtension1"] + } + ], + "disable_environment": { "DISABLE_LAYER_BASIC_1": "1"}, + "enable_environment": { "ENABLE_LAYER_BASIC_1": "134"} + } +} diff --git a/layers/linux/VkLayer_device_limits.json b/layers/linux/VkLayer_device_limits.json new file mode 100644 index 00000000..b26cffe8 --- /dev/null +++ b/layers/linux/VkLayer_device_limits.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_device_limits", + "type": "GLOBAL", + "library_path": "./libVkLayer_device_limits.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/VkLayer_draw_state.json b/layers/linux/VkLayer_draw_state.json new file mode 100644 index 00000000..71504afb --- /dev/null +++ b/layers/linux/VkLayer_draw_state.json @@ -0,0 +1,24 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_draw_state", + "type": "GLOBAL", + "library_path": "./libVkLayer_draw_state.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ], + "device_extensions": [ + { + "name": "VK_LUNARG_DEBUG_MARKER", + "spec_version": "0", + "entrypoints": ["vkCmdDbgMarkerBegin","vkCmdDbgMarkerEnd"] + } + ] + } +} diff --git a/layers/linux/VkLayer_generic.json b/layers/linux/VkLayer_generic.json new file mode 100644 index 00000000..fa2bc3df --- /dev/null +++ b/layers/linux/VkLayer_generic.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_generic", + "type": "GLOBAL", + "library_path": "./libVkLayer_generic.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Sample Layer" + } +} diff --git a/layers/linux/VkLayer_image.json b/layers/linux/VkLayer_image.json new file mode 100644 index 00000000..20651a3d --- /dev/null +++ b/layers/linux/VkLayer_image.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_image", + "type": "GLOBAL", + "library_path": "./libVkLayer_image.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/VkLayer_mem_tracker.json b/layers/linux/VkLayer_mem_tracker.json new file mode 100644 index 00000000..4d14d04b --- /dev/null +++ b/layers/linux/VkLayer_mem_tracker.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_mem_tracker", + "type": "GLOBAL", + "library_path": "./libVkLayer_mem_tracker.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/VkLayer_multi.json b/layers/linux/VkLayer_multi.json new file mode 100644 index 00000000..1ff35825 --- /dev/null +++ b/layers/linux/VkLayer_multi.json @@ -0,0 +1,25 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_multi1", + "type": "DEVICE", + "library_path": "./libVkLayer_multi.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Sample multiple layer per library", + "functions" : { + "vkGetDeviceProcAddr" : "multi1GetDeviceProcAddr" + } + }, + "layer" : { + "name": "VK_LUNARG_multi2", + "type": "INSTANCE", + "library_path": "./libVkLayer_multi.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Sample multiple layer per library", + "functions" : { + "vkGetInstanceProcAddr" : "multi2GetInstanceProcAddr" + } + } +} diff --git a/layers/linux/VkLayer_object_tracker.json b/layers/linux/VkLayer_object_tracker.json new file mode 100644 index 00000000..026630d6 --- /dev/null +++ b/layers/linux/VkLayer_object_tracker.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_object_tracker", + "type": "GLOBAL", + "library_path": "./libVkLayer_object_tracker.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/VkLayer_param_checker.json b/layers/linux/VkLayer_param_checker.json new file mode 100644 index 00000000..c0c07161 --- /dev/null +++ b/layers/linux/VkLayer_param_checker.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_param_checker", + "type": "GLOBAL", + "library_path": "./libVkLayer_param_checker.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/VkLayer_screenshot.json b/layers/linux/VkLayer_screenshot.json new file mode 100644 index 00000000..020f8374 --- /dev/null +++ b/layers/linux/VkLayer_screenshot.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_screenshot", + "type": "GLOBAL", + "library_path": "./libVkLayer_screenshot.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG image capture layer" + } +} diff --git a/layers/linux/VkLayer_swapchain.json b/layers/linux/VkLayer_swapchain.json new file mode 100644 index 00000000..dc9e15a9 --- /dev/null +++ b/layers/linux/VkLayer_swapchain.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_swapchain", + "type": "GLOBAL", + "library_path": "./libVkLayer_swapchain.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json new file mode 100644 index 00000000..6e4b0336 --- /dev/null +++ b/layers/linux/VkLayer_threading.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "1.0.0", + "layer" : { + "name": "VK_LAYER_LUNARG_threading", + "type": "GLOBAL", + "library_path": "./libVkLayer_threading.so", + "api_version": "0.210.0", + "implementation_version": "1", + "description": "LunarG Validation Layer", + "instance_extensions": [ + { + "name": "VK_EXT_debug_report", + "spec_version": "2" + } + ] + } +} diff --git a/layers/linux/api_dump.json b/layers/linux/api_dump.json deleted file mode 100644 index a2de51a5..00000000 --- a/layers/linux/api_dump.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_APIDump", - "type": "GLOBAL", - "library_path": "./libVKLayerAPIDump.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG debug layer" - } -} diff --git a/layers/linux/basic.json b/layers/linux/basic.json deleted file mode 100644 index 28e00f56..00000000 --- a/layers/linux/basic.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_Basic", - "type": "GLOBAL", - "library_path": "./libVKLayerBasic.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Sample Layer", - "device_extensions": [ - { - "name": "VK_LUNARG_LayerExtension1", - "spec_version": "0", - "entrypoints": ["vkLayerExtension1"] - } - ] - } -} diff --git a/layers/linux/basic_implicit.json b/layers/linux/basic_implicit.json deleted file mode 100644 index f8b8a67a..00000000 --- a/layers/linux/basic_implicit.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_Basic", - "type": "GLOBAL", - "library_path": "/etc/vulkan/implicit_layer.d/libVKLayerBasic.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Sample Layer", - "device_extensions": [ - { - "name": "VK_LUNARG_LayerExtension1", - "spec_version": "0", - "entrypoints": ["vkLayerExtension1"] - } - ], - "disable_environment": { "DISABLE_LAYER_BASIC_1": "1"}, - "enable_environment": { "ENABLE_LAYER_BASIC_1": "134"} - } -} diff --git a/layers/linux/device_limits.json b/layers/linux/device_limits.json deleted file mode 100644 index bf7aa1bc..00000000 --- a/layers/linux/device_limits.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_DeviceLimits", - "type": "GLOBAL", - "library_path": "./libVKLayerDeviceLimits.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} diff --git a/layers/linux/draw_state.json b/layers/linux/draw_state.json deleted file mode 100644 index 49c7d3b9..00000000 --- a/layers/linux/draw_state.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_DrawState", - "type": "GLOBAL", - "library_path": "./libVKLayerDrawState.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ], - "device_extensions": [ - { - "name": "VK_LUNARG_DEBUG_MARKER", - "spec_version": "0", - "entrypoints": ["vkCmdDbgMarkerBegin","vkCmdDbgMarkerEnd"] - } - ] - } -} diff --git a/layers/linux/generic.json b/layers/linux/generic.json deleted file mode 100644 index 44ec1245..00000000 --- a/layers/linux/generic.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_Generic", - "type": "GLOBAL", - "library_path": "./libVKLayerGeneric.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Sample Layer" - } -} diff --git a/layers/linux/image.json b/layers/linux/image.json deleted file mode 100644 index b1fb9eb7..00000000 --- a/layers/linux/image.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_Image", - "type": "GLOBAL", - "library_path": "./libVKLayerImage.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} diff --git a/layers/linux/mem_tracker.json b/layers/linux/mem_tracker.json deleted file mode 100644 index 8ecf849b..00000000 --- a/layers/linux/mem_tracker.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_MemTracker", - "type": "GLOBAL", - "library_path": "./libVKLayerMemTracker.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} diff --git a/layers/linux/multi.json b/layers/linux/multi.json deleted file mode 100644 index 610b3028..00000000 --- a/layers/linux/multi.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_multi1", - "type": "DEVICE", - "library_path": "./libVKLayerMulti.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Sample multiple layer per library", - "functions" : { - "vkGetDeviceProcAddr" : "multi1GetDeviceProcAddr" - } - }, - "layer" : { - "name": "VK_LUNARG_multi2", - "type": "INSTANCE", - "library_path": "./libVKLayerMulti.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Sample multiple layer per library", - "functions" : { - "vkGetInstanceProcAddr" : "multi2GetInstanceProcAddr" - } - } -} diff --git a/layers/linux/object_tracker.json b/layers/linux/object_tracker.json deleted file mode 100644 index 7b21a910..00000000 --- a/layers/linux/object_tracker.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_ObjectTracker", - "type": "GLOBAL", - "library_path": "./libVKLayerObjectTracker.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} diff --git a/layers/linux/param_checker.json b/layers/linux/param_checker.json deleted file mode 100644 index 305e79b5..00000000 --- a/layers/linux/param_checker.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_ParamChecker", - "type": "GLOBAL", - "library_path": "./libVKLayerParamChecker.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} diff --git a/layers/linux/screenshot.json b/layers/linux/screenshot.json deleted file mode 100644 index 4b622daf..00000000 --- a/layers/linux/screenshot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_ScreenShot", - "type": "GLOBAL", - "library_path": "./libVKLayerScreenShot.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG image capture layer" - } -} diff --git a/layers/linux/swapchain.json b/layers/linux/swapchain.json deleted file mode 100644 index dc2ce5b6..00000000 --- a/layers/linux/swapchain.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_Swapchain", - "type": "GLOBAL", - "library_path": "./libVKLayerSwapchain.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} diff --git a/layers/linux/threading.json b/layers/linux/threading.json deleted file mode 100644 index 3e64325e..00000000 --- a/layers/linux/threading.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "1.0.0", - "layer" : { - "name": "VK_LAYER_LUNARG_Threading", - "type": "GLOBAL", - "library_path": "./libVKLayerThreading.so", - "api_version": "0.210.0", - "implementation_version": "1", - "description": "LunarG Validation Layer", - "instance_extensions": [ - { - "name": "VK_EXT_debug_report", - "spec_version": "2" - } - ] - } -} -- cgit v1.2.3