From 0d3d1b895eb8b4f1e189991c5e7622cbb0f3d5cc Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 30 Jul 2015 10:49:03 -0600 Subject: layers: Add separate windows and linux json --- layers/CMakeLists.txt | 4 ++-- layers/api_dump.json | 11 ----------- layers/basic.json | 17 ----------------- layers/draw_state.json | 17 ----------------- layers/generic.json | 11 ----------- layers/image.json | 11 ----------- layers/linux/api_dump.json | 11 +++++++++++ layers/linux/basic.json | 17 +++++++++++++++++ layers/linux/draw_state.json | 17 +++++++++++++++++ layers/linux/generic.json | 11 +++++++++++ layers/linux/image.json | 11 +++++++++++ layers/linux/mem_tracker.json | 11 +++++++++++ layers/linux/multi.json | 19 +++++++++++++++++++ layers/linux/object_tracker.json | 11 +++++++++++ layers/linux/param_checker.json | 11 +++++++++++ layers/linux/screenshot.json | 11 +++++++++++ layers/linux/shader_checker.json | 11 +++++++++++ layers/linux/threading.json | 11 +++++++++++ layers/mem_tracker.json | 11 ----------- layers/multi.json | 19 ------------------- layers/object_tracker.json | 11 ----------- layers/param_checker.json | 11 ----------- layers/screenshot.json | 11 ----------- layers/shader_checker.json | 11 ----------- layers/threading.json | 11 ----------- layers/windows/api_dump.json | 11 +++++++++++ layers/windows/basic.json | 17 +++++++++++++++++ layers/windows/draw_state.json | 17 +++++++++++++++++ layers/windows/generic.json | 11 +++++++++++ layers/windows/image.json | 11 +++++++++++ layers/windows/mem_tracker.json | 11 +++++++++++ layers/windows/multi.json | 19 +++++++++++++++++++ layers/windows/object_tracker.json | 11 +++++++++++ layers/windows/param_checker.json | 11 +++++++++++ layers/windows/screenshot.json | 11 +++++++++++ layers/windows/shader_checker.json | 11 +++++++++++ layers/windows/threading.json | 11 +++++++++++ 37 files changed, 306 insertions(+), 154 deletions(-) delete mode 100644 layers/api_dump.json delete mode 100644 layers/basic.json delete mode 100644 layers/draw_state.json delete mode 100644 layers/generic.json delete mode 100644 layers/image.json create mode 100644 layers/linux/api_dump.json create mode 100644 layers/linux/basic.json create mode 100644 layers/linux/draw_state.json create mode 100644 layers/linux/generic.json create mode 100644 layers/linux/image.json create mode 100644 layers/linux/mem_tracker.json create mode 100644 layers/linux/multi.json create mode 100644 layers/linux/object_tracker.json create mode 100644 layers/linux/param_checker.json create mode 100644 layers/linux/screenshot.json create mode 100644 layers/linux/shader_checker.json create mode 100644 layers/linux/threading.json delete mode 100644 layers/mem_tracker.json delete mode 100644 layers/multi.json delete mode 100644 layers/object_tracker.json delete mode 100644 layers/param_checker.json delete mode 100644 layers/screenshot.json delete mode 100644 layers/shader_checker.json delete mode 100644 layers/threading.json create mode 100644 layers/windows/api_dump.json create mode 100644 layers/windows/basic.json create mode 100644 layers/windows/draw_state.json create mode 100644 layers/windows/generic.json create mode 100644 layers/windows/image.json create mode 100644 layers/windows/mem_tracker.json create mode 100644 layers/windows/multi.json create mode 100644 layers/windows/object_tracker.json create mode 100644 layers/windows/param_checker.json create mode 100644 layers/windows/screenshot.json create mode 100644 layers/windows/shader_checker.json create mode 100644 layers/windows/threading.json (limited to 'layers') diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 685f01ad..b7487ce8 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -37,7 +37,7 @@ if (NOT WIN32) if (NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)) foreach (config_file ${LAYER_JSON_FILES}) add_custom_target(${config_file}-json ALL - COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/${config_file}.json + COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json VERBATIM ) endforeach(config_file) @@ -45,7 +45,7 @@ if (NOT WIN32) else() if (NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)) foreach (config_file ${LAYER_JSON_FILES}) - FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${config_file}.json src_json) + FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/windows/${config_file}.json src_json) FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/$/${config_file}.json dst_json) add_custom_target(${config_file}-json ALL COMMAND copy ${src_json} ${dst_json} diff --git a/layers/api_dump.json b/layers/api_dump.json deleted file mode 100644 index 688d2347..00000000 --- a/layers/api_dump.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "APIDump", - "type": "GLOBAL", - "library_path": "./libVKLayerAPIDump.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG debug layer" - } -} diff --git a/layers/basic.json b/layers/basic.json deleted file mode 100644 index 5793d973..00000000 --- a/layers/basic.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "Basic", - "type": "GLOBAL", - "library_path": "./libVKLayerBasic.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Sample Layer", - "device_extensions": [ - { - "name": "vkLayerExtension1", - "version": "1.0.0" - } - ] - } -} diff --git a/layers/draw_state.json b/layers/draw_state.json deleted file mode 100644 index 114487d6..00000000 --- a/layers/draw_state.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "DrawState", - "type": "GLOBAL", - "library_path": "./libVKLayerDrawState.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer", - "device_extensions": [ - { - "name": "DEBUG_MARKER", - "version": "1.0.0" - } - ] - } -} diff --git a/layers/generic.json b/layers/generic.json deleted file mode 100644 index 403ad75d..00000000 --- a/layers/generic.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "Generic", - "type": "GLOBAL", - "library_path": "./libVKLayerGeneric.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Sample Layer" - } -} diff --git a/layers/image.json b/layers/image.json deleted file mode 100644 index 9063b608..00000000 --- a/layers/image.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "Image", - "type": "GLOBAL", - "library_path": "./libVKLayerImage.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer" - } -} diff --git a/layers/linux/api_dump.json b/layers/linux/api_dump.json new file mode 100644 index 00000000..688d2347 --- /dev/null +++ b/layers/linux/api_dump.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "APIDump", + "type": "GLOBAL", + "library_path": "./libVKLayerAPIDump.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG debug layer" + } +} diff --git a/layers/linux/basic.json b/layers/linux/basic.json new file mode 100644 index 00000000..5793d973 --- /dev/null +++ b/layers/linux/basic.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Basic", + "type": "GLOBAL", + "library_path": "./libVKLayerBasic.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample Layer", + "device_extensions": [ + { + "name": "vkLayerExtension1", + "version": "1.0.0" + } + ] + } +} diff --git a/layers/linux/draw_state.json b/layers/linux/draw_state.json new file mode 100644 index 00000000..114487d6 --- /dev/null +++ b/layers/linux/draw_state.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "DrawState", + "type": "GLOBAL", + "library_path": "./libVKLayerDrawState.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer", + "device_extensions": [ + { + "name": "DEBUG_MARKER", + "version": "1.0.0" + } + ] + } +} diff --git a/layers/linux/generic.json b/layers/linux/generic.json new file mode 100644 index 00000000..403ad75d --- /dev/null +++ b/layers/linux/generic.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Generic", + "type": "GLOBAL", + "library_path": "./libVKLayerGeneric.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample Layer" + } +} diff --git a/layers/linux/image.json b/layers/linux/image.json new file mode 100644 index 00000000..9063b608 --- /dev/null +++ b/layers/linux/image.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Image", + "type": "GLOBAL", + "library_path": "./libVKLayerImage.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/linux/mem_tracker.json b/layers/linux/mem_tracker.json new file mode 100644 index 00000000..627238f8 --- /dev/null +++ b/layers/linux/mem_tracker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "MemTracker", + "type": "GLOBAL", + "library_path": "./libVKLayerMemTracker.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/linux/multi.json b/layers/linux/multi.json new file mode 100644 index 00000000..8e2df520 --- /dev/null +++ b/layers/linux/multi.json @@ -0,0 +1,19 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "multi1", + "type": "GLOBAL", + "library_path": "./libVKLayerMulti.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample multiple layer per library" + }, + "layer" : { + "name": "multi2", + "type": "GLOBAL", + "library_path": "./libVKLayerMulti.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample multiple layer per library" + } +} diff --git a/layers/linux/object_tracker.json b/layers/linux/object_tracker.json new file mode 100644 index 00000000..78434317 --- /dev/null +++ b/layers/linux/object_tracker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ObjectTracker", + "type": "GLOBAL", + "library_path": "./libVKLayerObjectTracker.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/linux/param_checker.json b/layers/linux/param_checker.json new file mode 100644 index 00000000..431472fd --- /dev/null +++ b/layers/linux/param_checker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ParamChecker", + "type": "GLOBAL", + "library_path": "./libVKLayerParamChecker.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/linux/screenshot.json b/layers/linux/screenshot.json new file mode 100644 index 00000000..9413f6f5 --- /dev/null +++ b/layers/linux/screenshot.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ScreenShot", + "type": "DEVICE", + "library_path": "./libVKLayerScreenShot.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG image capture layer" + } +} diff --git a/layers/linux/shader_checker.json b/layers/linux/shader_checker.json new file mode 100644 index 00000000..08d997ad --- /dev/null +++ b/layers/linux/shader_checker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ShaderChecker", + "type": "GLOBAL", + "library_path": "./libVKLayerShaderChecker.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/linux/threading.json b/layers/linux/threading.json new file mode 100644 index 00000000..2a7d8eb8 --- /dev/null +++ b/layers/linux/threading.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Threading", + "type": "GLOBAL", + "library_path": "./libVKLayerThreading.so", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/mem_tracker.json b/layers/mem_tracker.json deleted file mode 100644 index 627238f8..00000000 --- a/layers/mem_tracker.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "MemTracker", - "type": "GLOBAL", - "library_path": "./libVKLayerMemTracker.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer" - } -} diff --git a/layers/multi.json b/layers/multi.json deleted file mode 100644 index 8e2df520..00000000 --- a/layers/multi.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "multi1", - "type": "GLOBAL", - "library_path": "./libVKLayerMulti.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Sample multiple layer per library" - }, - "layer" : { - "name": "multi2", - "type": "GLOBAL", - "library_path": "./libVKLayerMulti.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Sample multiple layer per library" - } -} diff --git a/layers/object_tracker.json b/layers/object_tracker.json deleted file mode 100644 index 78434317..00000000 --- a/layers/object_tracker.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "ObjectTracker", - "type": "GLOBAL", - "library_path": "./libVKLayerObjectTracker.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer" - } -} diff --git a/layers/param_checker.json b/layers/param_checker.json deleted file mode 100644 index 431472fd..00000000 --- a/layers/param_checker.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "ParamChecker", - "type": "GLOBAL", - "library_path": "./libVKLayerParamChecker.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer" - } -} diff --git a/layers/screenshot.json b/layers/screenshot.json deleted file mode 100644 index 9413f6f5..00000000 --- a/layers/screenshot.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "ScreenShot", - "type": "DEVICE", - "library_path": "./libVKLayerScreenShot.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG image capture layer" - } -} diff --git a/layers/shader_checker.json b/layers/shader_checker.json deleted file mode 100644 index 08d997ad..00000000 --- a/layers/shader_checker.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "ShaderChecker", - "type": "GLOBAL", - "library_path": "./libVKLayerShaderChecker.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer" - } -} diff --git a/layers/threading.json b/layers/threading.json deleted file mode 100644 index 2a7d8eb8..00000000 --- a/layers/threading.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "file_format_version" : "0.9.0", - "layer" : { - "name": "Threading", - "type": "GLOBAL", - "library_path": "./libVKLayerThreading.so", - "abi_versions": "1.0.0", - "implementation_version": "1.0.0", - "description": "LunarG Validation Layer" - } -} diff --git a/layers/windows/api_dump.json b/layers/windows/api_dump.json new file mode 100644 index 00000000..02d0b01f --- /dev/null +++ b/layers/windows/api_dump.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "APIDump", + "type": "GLOBAL", + "library_path": "./VKLayerAPIDump.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG debug layer" + } +} diff --git a/layers/windows/basic.json b/layers/windows/basic.json new file mode 100644 index 00000000..8a15d9b1 --- /dev/null +++ b/layers/windows/basic.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Basic", + "type": "GLOBAL", + "library_path": "./VKLayerBasic.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample Layer", + "device_extensions": [ + { + "name": "vkLayerExtension1", + "version": "1.0.0" + } + ] + } +} diff --git a/layers/windows/draw_state.json b/layers/windows/draw_state.json new file mode 100644 index 00000000..2d0414f1 --- /dev/null +++ b/layers/windows/draw_state.json @@ -0,0 +1,17 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "DrawState", + "type": "GLOBAL", + "library_path": "./VKLayerDrawState.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer", + "device_extensions": [ + { + "name": "DEBUG_MARKER", + "version": "1.0.0" + } + ] + } +} diff --git a/layers/windows/generic.json b/layers/windows/generic.json new file mode 100644 index 00000000..b13a11e7 --- /dev/null +++ b/layers/windows/generic.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Generic", + "type": "GLOBAL", + "library_path": "./VKLayerGeneric.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample Layer" + } +} diff --git a/layers/windows/image.json b/layers/windows/image.json new file mode 100644 index 00000000..d3e85706 --- /dev/null +++ b/layers/windows/image.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Image", + "type": "GLOBAL", + "library_path": "./VKLayerImage.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/windows/mem_tracker.json b/layers/windows/mem_tracker.json new file mode 100644 index 00000000..bd0abe69 --- /dev/null +++ b/layers/windows/mem_tracker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "MemTracker", + "type": "GLOBAL", + "library_path": "./VKLayerMemTracker.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/windows/multi.json b/layers/windows/multi.json new file mode 100644 index 00000000..6d759c7b --- /dev/null +++ b/layers/windows/multi.json @@ -0,0 +1,19 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "multi1", + "type": "GLOBAL", + "library_path": "./VKLayerMulti.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample multiple layer per library" + }, + "layer" : { + "name": "multi2", + "type": "GLOBAL", + "library_path": "./VKLayerMulti.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Sample multiple layer per library" + } +} diff --git a/layers/windows/object_tracker.json b/layers/windows/object_tracker.json new file mode 100644 index 00000000..1ce450d1 --- /dev/null +++ b/layers/windows/object_tracker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ObjectTracker", + "type": "GLOBAL", + "library_path": "./VKLayerObjectTracker.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/windows/param_checker.json b/layers/windows/param_checker.json new file mode 100644 index 00000000..93f1c6b6 --- /dev/null +++ b/layers/windows/param_checker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ParamChecker", + "type": "GLOBAL", + "library_path": "./VKLayerParamChecker.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/windows/screenshot.json b/layers/windows/screenshot.json new file mode 100644 index 00000000..33cd4d34 --- /dev/null +++ b/layers/windows/screenshot.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ScreenShot", + "type": "DEVICE", + "library_path": "./VKLayerScreenShot.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG image capture layer" + } +} diff --git a/layers/windows/shader_checker.json b/layers/windows/shader_checker.json new file mode 100644 index 00000000..ca6e21ca --- /dev/null +++ b/layers/windows/shader_checker.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "ShaderChecker", + "type": "GLOBAL", + "library_path": "./VKLayerShaderChecker.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} diff --git a/layers/windows/threading.json b/layers/windows/threading.json new file mode 100644 index 00000000..6dda4e01 --- /dev/null +++ b/layers/windows/threading.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "0.9.0", + "layer" : { + "name": "Threading", + "type": "GLOBAL", + "library_path": "./VKLayerThreading.dll", + "abi_versions": "1.0.0", + "implementation_version": "1.0.0", + "description": "LunarG Validation Layer" + } +} -- cgit v1.2.3