diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-07-01 10:53:31 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-07-22 11:32:25 -0600 |
| commit | 4d8dde0dea50100cf2fabd85b7f1c2d2d95311eb (patch) | |
| tree | 53137de0a3a9793dda9fc57e6234ec3438344f02 /build-android/android-generate.bat | |
| parent | 1606eb9bdeb72ae5dc1640b66c3936b395936fcd (diff) | |
| download | usermoji-4d8dde0dea50100cf2fabd85b7f1c2d2d95311eb.tar.xz | |
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
Diffstat (limited to 'build-android/android-generate.bat')
| -rw-r--r-- | build-android/android-generate.bat | 8 |
1 files changed, 2 insertions, 6 deletions
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
|