summaryrefslogtreecommitdiff
path: root/build-android
diff options
context:
space:
mode:
Diffstat (limited to 'build-android')
-rw-r--r--build-android/android-generate.bat3
-rwxr-xr-xbuild-android/android-generate.sh3
2 files changed, 2 insertions, 4 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index 519e0ef5..48253373 100644
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -19,12 +19,11 @@ if exist generated (
)
mkdir generated\include generated\common
-python ../scripts/vk-generate.py Android dispatch-table-ops layer > generated/include/vk_dispatch_table_helper.h
-
python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
python ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
cd generated/include
+python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h
python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h
python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h
python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index fb82998c..04c837d9 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -21,11 +21,10 @@ cd $dir
rm -rf generated
mkdir -p generated/include generated/common
-python ../scripts/vk-generate.py Android dispatch-table-ops layer > generated/include/vk_dispatch_table_helper.h
-
python ../scripts/vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
python ../scripts/vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
+( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h )
( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h )
( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.h )
( cd generated/include; python ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h )