From 60afd130f9e240dacec33e4897be7dc87d422537 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 1 Aug 2017 13:02:20 -0600 Subject: layers: Re-architect parameter validation layer Changed the codegen to autogenerate validation functions for any new APIs without user intervention. Manual updates are only necessary to extend PV functionality. - parameter_validation.h is now checked into the layers directory - parameter_validation.cpp is now generated - parameter_validation_utils.cpp is new and contains any custom (non-generated) or housekeeping functions. - parameter_validation_utils.h is deprecated - updated database for new VUID coverage Change-Id: Ib9261894386145573ba9e8906ba4ad4e9fecbdfd --- build-android/android-generate.bat | 2 +- build-android/android-generate.sh | 2 +- build-android/cmake/layerlib/CMakeLists.txt | 3 ++- build-android/jni/Android.mk | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'build-android') diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 94b9817f..318c59f8 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -28,7 +28,7 @@ py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_st py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_object_types.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h -py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h +py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.cpp py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_layer_dispatch_table.h py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index 04392b97..9b1d94b8 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -29,7 +29,7 @@ mkdir -p generated/include generated/common ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_object_types.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h ) -( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h ) +( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.cpp ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_loader_extensions.h ) ( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_loader_extensions.c ) diff --git a/build-android/cmake/layerlib/CMakeLists.txt b/build-android/cmake/layerlib/CMakeLists.txt index 7cb18403..7dbf52dc 100644 --- a/build-android/cmake/layerlib/CMakeLists.txt +++ b/build-android/cmake/layerlib/CMakeLists.txt @@ -77,7 +77,8 @@ target_link_libraries(VkLayer_core_validation PRIVATE log layer_utils SPIRV-Tools-prebuilt) add_library(VkLayer_parameter_validation SHARED - ${SRC_DIR}/layers/parameter_validation.cpp + ${COMMON_DIR}/include/parameter_validation.cpp + ${SRC_DIR}/layers/parameter_validation_utils.cpp ${SRC_DIR}/layers/vk_layer_table.cpp) target_include_directories(VkLayer_parameter_validation PRIVATE ${SRC_DIR}/include diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 1ce95a07..36956309 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -53,7 +53,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_parameter_validation -LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/include/parameter_validation.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation_utils.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(LAYER_DIR)/include \ -- cgit v1.2.3