diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-09-06 16:12:23 -0600 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-10-06 15:54:51 -0600 |
| commit | cea3654fac151d410e7dd88a1325f75ec7401e57 (patch) | |
| tree | 38bc8eba0d4afe2cfff73fc0a2279e36ccc9340c /build-android/android-generate.sh | |
| parent | a055dcaf37d8ae3ba3e388a6c421f4752cd34b5a (diff) | |
| download | usermoji-cea3654fac151d410e7dd88a1325f75ec7401e57.tar.xz | |
Layers: Implement unique_objects layer using vk.xml
UniqueObjects was the final LVL layer not using vk.xml for codegen.
The new implementation follows the threading layer model which
(outside of safe_struct dependencies) is more tolerant of API
changes. Also updated for structure and style.
build-android/android-generate.bat - Updated for build
build-android/android-generate.sh - Updated for build
generator.py - Added Unique Objects Generator
genvk.py - Added call to U_O generator
layers/CMakeLists.txt - Updated for build
layers/unique_objects.cpp - New: manually generated code
layers/unique_objects.h - Now a true header file
vk-layer-generate.py - killed!
Change-Id: I0d57871dfd2600829502f0bffd7cf6f926b7d5e7
Diffstat (limited to 'build-android/android-generate.sh')
| -rwxr-xr-x | build-android/android-generate.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index fb0e8678..847828f8 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -26,9 +26,9 @@ 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 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 ) +( cd generated/include; python ../../../genvk.py unique_objects -registry ../../../vk.xml unique_objects_wrappers.h ) cp -f ../layers/vk_layer_config.cpp generated/common/ cp -f ../layers/vk_layer_extension_utils.cpp generated/common/ @@ -40,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 ../layers ../layers ../layers ../layers generated/include) +declare src_dirs=(../layers ../layers ../layers ../layers ../layers ../layers ../layers) SRC_ROOT=generated/layer-src BUILD_ROOT=generated/gradle-build @@ -63,7 +63,4 @@ cp generated/common/descriptor_sets.cpp ${SRC_ROOT}/core_validation/descriptor_ cp generated/include/vk_safe_struct.cpp ${SRC_ROOT}/core_validation/vk_safe_struct.cpp 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/unique_objects.cpp - exit 0 |