From 494ea3500813dd2618f1c51ca21bb1b40bdeaae1 Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Wed, 15 Nov 2017 16:10:39 -0700 Subject: layers:Add pre-built DevSim layer Checking-in DevSim binary for linux to use in Travis-CI testing along with seven initial json profiles to be tested w/ DevSim on top of mock. --- layers/CMakeLists.txt | 31 +++++++++++++++++++++++++-- layers/linux/VkLayer_device_simulation.json | 11 ++++++++++ layers/linux/libVkLayer_device_simulation.so | Bin 0 -> 350874 bytes 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 layers/linux/VkLayer_device_simulation.json create mode 100755 layers/linux/libVkLayer_device_simulation.so diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index f9f1333d..d0311710 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -39,6 +39,14 @@ set(LAYER_JSON_FILES_NO_DEPENDENCIES set(LAYER_JSON_FILES ${LAYER_JSON_FILES_WITH_DEPENDENCIES} ${LAYER_JSON_FILES_NO_DEPENDENCIES}) +set(LAYER_BINARY_JSON_FILES + VkLayer_device_simulation + ) + +set(LAYER_BINARY_FILES + libVkLayer_device_simulation + ) + if (WIN32) if (NOT (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)) if (CMAKE_GENERATOR MATCHES "^Visual Studio.*") @@ -77,6 +85,18 @@ else() VERBATIM ) endforeach(config_file) + foreach (config_file ${LAYER_BINARY_JSON_FILES}) + add_custom_target(${config_file}-json ALL + COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json + VERBATIM + ) + endforeach(config_file) + foreach (config_file ${LAYER_BINARY_FILES}) + add_custom_target(${config_file}-so ALL + COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.so + VERBATIM + ) + endforeach(config_file) # Add link to vk_validation_error_messages.h in build dir for scripts to pick up add_custom_target(vk_validation_error_messages ALL COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/vk_validation_error_messages.h @@ -84,7 +104,7 @@ else() ) endif() endif() -# If a layer has a direcgt dependency on a project with the same name, use it. +# If a layer has a direct dependency on a project with the same name, use it. foreach (config_file ${LAYER_JSON_FILES_WITH_DEPENDENCIES}) add_dependencies(${config_file}-json ${config_file}) endforeach(config_file) @@ -92,7 +112,14 @@ endforeach(config_file) foreach (config_file ${LAYER_JSON_FILES_NO_DEPENDENCIES}) add_dependencies(${config_file}-json VkLayer_utils) endforeach(config_file) - +if(UNIX) + foreach (config_file ${LAYER_BINARY_JSON_FILES}) + add_dependencies(${config_file}-json VkLayer_utils) + endforeach(config_file) + foreach (config_file ${LAYER_BINARY_FILES}) + add_dependencies(${config_file}-so VkLayer_utils) + endforeach(config_file) +endif() # Add targets for JSON file install on Linux. # Need to remove the "./" from the library path before installing to /etc. diff --git a/layers/linux/VkLayer_device_simulation.json b/layers/linux/VkLayer_device_simulation.json new file mode 100644 index 00000000..81b82134 --- /dev/null +++ b/layers/linux/VkLayer_device_simulation.json @@ -0,0 +1,11 @@ +{ + "file_format_version" : "1.1.0", + "layer" : { + "name": "VK_LAYER_LUNARG_device_simulation", + "type": "GLOBAL", + "library_path": "./libVkLayer_device_simulation.so", + "api_version": "1.0.65", + "implementation_version": "1.2.0", + "description": "LunarG device simulation layer" + } +} diff --git a/layers/linux/libVkLayer_device_simulation.so b/layers/linux/libVkLayer_device_simulation.so new file mode 100755 index 00000000..3bfea567 Binary files /dev/null and b/layers/linux/libVkLayer_device_simulation.so differ -- cgit v1.2.3