From 4d8dde0dea50100cf2fabd85b7f1c2d2d95311eb Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Fri, 1 Jul 2016 10:53:31 -0600 Subject: layers: Update object_tracker layer Removed dead code, added per-instance and per-device object tracking, (this was broken in codegen'd version with no cross-device validation), updated for new layer architectures and coding standards, removed OT-related codegen -- it is now a standalone cpp file. Change-Id: I64464b855e1b4841c8e3a581387e0e9065b006f7 --- build-android/android-generate.bat | 8 ++------ build-android/android-generate.sh | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'build-android') diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 945509b9..a70642ec 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -24,7 +24,6 @@ python ../vk-generate.py Android dispatch-table-ops layer > generated/include/vk python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include -python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/include/object_tracker.cpp python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/include/unique_objects.cpp cd generated/include @@ -48,17 +47,14 @@ cd generated\layer-src mkdir core_validation image object_tracker parameter_validation swapchain threading unique_objects cd ..\.. xcopy /s gradle-templates\* generated\gradle-build\ -for %%G in (core_validation image parameter_validation swapchain threading) Do ( +for %%G in (core_validation image object_tracker parameter_validation swapchain threading) Do ( copy ..\layers\%%G.cpp generated\layer-src\%%G echo apply from: "../common.gradle" > generated\gradle-build\%%G\build.gradle ) -copy generated\include\object_tracker.cpp generated\layer-src\object_tracker -echo apply from: "../common.gradle" > generated\gradle-build\object_tracker\build.gradle -copy generated\include\unique_objects.cpp generated\layer-src\unique_objects +copy generated\include\unique_objects.cpp generated\layer-src\unique_objects copy generated\common\descriptor_sets.cpp generated\layer-src\core_validation\descriptor_sets.cpp copy generated\include\vk_safe_struct.cpp generated\layer-src\core_validation\vk_safe_struct.cpp move generated\include\vk_safe_struct.cpp generated\layer-src\unique_objects\vk_safe_struct.cpp echo apply from: "../common.gradle" > generated\gradle-build\unique_objects\build.gradle -del /f /q generated\include\object_tracker.cpp del /f /q generated\include\unique_objects.cpp diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index d72f4a92..fb0e8678 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -26,7 +26,6 @@ python ../vk-generate.py Android dispatch-table-ops layer > generated/include/vk python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include -python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/include/object_tracker.cpp python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/include/unique_objects.cpp ( cd generated/include; python ../../../genvk.py threading -registry ../../../vk.xml thread_check.h ) ( cd generated/include; python ../../../genvk.py paramchecker -registry ../../../vk.xml parameter_validation.h ) @@ -41,7 +40,7 @@ cp -f ../layers/descriptor_sets.cpp generated/common/ # 1 to 1 correspondence -- one layer one source file; additional files are copied # at fixup step declare layers=(core_validation image object_tracker parameter_validation swapchain threading unique_objects) -declare src_dirs=(../layers ../layers generated/include ../layers ../layers ../layers generated/include) +declare src_dirs=(../layers ../layers ../layers ../layers ../layers ../layers generated/include) SRC_ROOT=generated/layer-src BUILD_ROOT=generated/gradle-build @@ -65,7 +64,6 @@ cp generated/include/vk_safe_struct.cpp ${SRC_ROOT}/core_validation/vk_safe_str mv generated/include/vk_safe_struct.cpp ${SRC_ROOT}/unique_objects/vk_safe_struct.cpp # fixup - remove copied files from generated/include -rm generated/include/object_tracker.cpp rm generated/include/unique_objects.cpp exit 0 -- cgit v1.2.3