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
diff --git a/tests/_run_all_tests_with_layers.ps1 b/tests/_run_all_tests_with_layers.ps1
index bdb11ee..db88c0f 100755
--- a/tests/_run_all_tests_with_layers.ps1
+++ b/tests/_run_all_tests_with_layers.ps1
@@ -11,8 +11,8 @@
Set-Item -path env:Path -value ($env:Path + ";..\loader\$dPath")
Set-Item -path env:Path -value ($env:Path + ";gtest-1.7.0\$dPath")
-$env:VK_INSTANCE_LAYERS = "VK_LAYER_LUNARG_Threading;VK_LAYER_LUNARG_MemTracker;VK_LAYER_LUNARG_ObjectTracker;VK_LAYER_LUNARG_DrawState;VK_LAYER_LUNARG_ParamChecker;VK_LAYER_LUNARG_Swapchain;VK_LAYER_LUNARG_DeviceLimits;VK_LAYER_LUNARG_Image"
-$env:VK_DEVICE_LAYERS = "VK_LAYER_LUNARG_Threading;VK_LAYER_LUNARG_MemTracker;VK_LAYER_LUNARG_ObjectTracker;VK_LAYER_LUNARG_DrawState;VK_LAYER_LUNARG_ParamChecker;VK_LAYER_LUNARG_Swapchain;VK_LAYER_LUNARG_DeviceLimits;VK_LAYER_LUNARG_Image"
+$env:VK_INSTANCE_LAYERS = "VK_LAYER_LUNARG_threading;VK_LAYER_LUNARG_mem_tracker;VK_LAYER_LUNARG_object_tracker;VK_LAYER_LUNARG_draw_state;VK_LAYER_LUNARG_param_checker;VK_LAYER_LUNARG_swapchain;VK_LAYER_LUNARG_device_limits;VK_LAYER_LUNARG_image"
+$env:VK_DEVICE_LAYERS = "VK_LAYER_LUNARG_threading;VK_LAYER_LUNARG_mem_tracker;VK_LAYER_LUNARG_object_tracker;VK_LAYER_LUNARG_draw_state;VK_LAYER_LUNARG_param_checker;VK_LAYER_LUNARG_swapchain;VK_LAYER_LUNARG_device_limits;VK_LAYER_LUNARG_image"
$env:VK_LAYER_PATH = "..\layers\$dPath"
Copy-Item ..\..\tests\vk_layer_settings.txt .
diff --git a/tests/_vktracereplay.ps1 b/tests/_vktracereplay.ps1
index d77b252..375c7ec 100644
--- a/tests/_vktracereplay.ps1
+++ b/tests/_vktracereplay.ps1
@@ -26,10 +26,10 @@
cp ..\..\demos\*.ppm .
cp ..\..\demos\*.spv .
cp ..\..\loader\$dPath\vulkan-0.dll .
-cp ..\..\layers\$dPath\VKLayerScreenShot.dll .
+cp ..\..\layers\$dPath\VkLayerScreenShot.dll .
cp ..\..\layers\$dPath\screenshot.json .
-cp ..\..\layers\$dPath\vktrace_layer.dll .
-cp ..\..\layers\$dPath\vktrace_layer.json .
+cp ..\..\layers\$dPath\VkLayer_vktrace_layer.dll .
+cp ..\..\layers\$dPath\VkLayer_vktrace_layer.json .
# Change PATH to the temp directory
$oldpath = $Env:PATH
diff --git a/tests/layer_test_suite.py b/tests/layer_test_suite.py
index 77afa19..a1e72ec 100755
--- a/tests/layer_test_suite.py
+++ b/tests/layer_test_suite.py
@@ -40,7 +40,7 @@
parser.add_argument('--script_name', required=False, default='./run_all_tests_with_layers.sh', help='The script file to be executed and have its output checked.')
return parser.parse_args()
-expected_layers = ['DrawState', 'MemTracker', 'ParamChecker', 'ObjectTracker']
+expected_layers = ['draw_state', 'mem_tracker', 'param_checker', 'object_tracker']
# Format of this dict is <testname> key points to a list of expected error text
# The start of each line of output for any given test is compared against the expected error txt
diff --git a/tests/run_all_tests_with_layers.sh b/tests/run_all_tests_with_layers.sh
index 49cda4b..f487898 100755
--- a/tests/run_all_tests_with_layers.sh
+++ b/tests/run_all_tests_with_layers.sh
@@ -3,8 +3,8 @@
# Run all the regression tests with validation layers enabled
# enable layers
-export VK_INSTANCE_LAYERS=VK_LAYER_LUNARG_Threading:VK_LAYER_LUNARG_MemTracker:VK_LAYER_LUNARG_ObjectTracker:VK_LAYER_LUNARG_DrawState:VK_LAYER_LUNARG_ParamChecker:VK_LAYER_LUNARG_Swapchain:VK_LAYER_LUNARG_DeviceLimits:VK_LAYER_LUNARG_Image
-export VK_DEVICE_LAYERS=VK_LAYER_LUNARG_Threading:VK_LAYER_LUNARG_MemTracker:VK_LAYER_LUNARG_ObjectTracker:VK_LAYER_LUNARG_DrawState:VK_LAYER_LUNARG_ParamChecker:VK_LAYER_LUNARG_Swapchain:VK_LAYER_LUNARG_DeviceLimits:VK_LAYER_LUNARG_Image
+export VK_INSTANCE_LAYERS=VK_LAYER_LUNARG_threading:VK_LAYER_LUNARG_mem_tracker:VK_LAYER_LUNARG_object_tracker:VK_LAYER_LUNARG_draw_state:VK_LAYER_LUNARG_param_checker:VK_LAYER_LUNARG_swapchain:VK_LAYER_LUNARG_device_limits:VK_LAYER_LUNARG_image
+export VK_DEVICE_LAYERS=VK_LAYER_LUNARG_threading:VK_LAYER_LUNARG_mem_tracker:VK_LAYER_LUNARG_object_tracker:VK_LAYER_LUNARG_draw_state:VK_LAYER_LUNARG_param_checker:VK_LAYER_LUNARG_swapchain:VK_LAYER_LUNARG_device_limits:VK_LAYER_LUNARG_image
set -e
diff --git a/tests/vktracereplay.sh b/tests/vktracereplay.sh
index 96618ed..9bdbd7f 100755
--- a/tests/vktracereplay.sh
+++ b/tests/vktracereplay.sh
@@ -18,7 +18,7 @@
cd vktracereplay_tmp
cp ../../vktrace/vkreplay .
cp ../../vktrace/vktrace .
-cp ../../vktrace/libvktrace_layer.so .
+cp ../../vktrace/libVkLayer_vktrace_layer.so .
cp ../../demos/cube .
cp ../../demos/*ppm .
cp ../../demos/*spv .