From d89b45eaf2e1936d7099825ee53c75b1b766abc9 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Fri, 23 Dec 2016 11:20:17 +0100 Subject: [PATCH] Added Android build files for dynamic uniform buffer example --- CMakeLists.txt | 1 + android/build-all.bat | 1 + android/dynamicuniformbuffer/.gitignore | 10 ++++ .../dynamicuniformbuffer/AndroidManifest.xml | 27 +++++++++++ android/dynamicuniformbuffer/build.bat | 19 ++++++++ android/dynamicuniformbuffer/jni/Android.mk | 48 +++++++++++++++++++ .../dynamicuniformbuffer/jni/Application.mk | 6 +++ android/uninstall-all.bat | 1 + 8 files changed, 113 insertions(+) create mode 100644 android/dynamicuniformbuffer/.gitignore create mode 100644 android/dynamicuniformbuffer/AndroidManifest.xml create mode 100644 android/dynamicuniformbuffer/build.bat create mode 100644 android/dynamicuniformbuffer/jni/Android.mk create mode 100644 android/dynamicuniformbuffer/jni/Application.mk diff --git a/CMakeLists.txt b/CMakeLists.txt index 52aed192..21e4ae36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ set(EXAMPLES deferredshadows displacement distancefieldfonts + dynamicuniformbuffer gears geometryshader indirectdraw diff --git a/android/build-all.bat b/android/build-all.bat index cffa4f24..dcd63c95 100644 --- a/android/build-all.bat +++ b/android/build-all.bat @@ -3,6 +3,7 @@ call _build computeparticles %1 call _build computenbody %1 call _build computeshader %1 call _build computecullandlod %1 +call _build dynamicuniformbuffer %1 call _build parallaxmapping %1 call _build bloom %1 call _build gears %1 diff --git a/android/dynamicuniformbuffer/.gitignore b/android/dynamicuniformbuffer/.gitignore new file mode 100644 index 00000000..7a5d249c --- /dev/null +++ b/android/dynamicuniformbuffer/.gitignore @@ -0,0 +1,10 @@ +/assets/ +/res/ +/bin/ +/libs/ +/obj/ +/build.xml +/local.properties +/project.properties +/proguard-project.txt +*.apk \ No newline at end of file diff --git a/android/dynamicuniformbuffer/AndroidManifest.xml b/android/dynamicuniformbuffer/AndroidManifest.xml new file mode 100644 index 00000000..c4d40df3 --- /dev/null +++ b/android/dynamicuniformbuffer/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/android/dynamicuniformbuffer/build.bat b/android/dynamicuniformbuffer/build.bat new file mode 100644 index 00000000..a0db2ab4 --- /dev/null +++ b/android/dynamicuniformbuffer/build.bat @@ -0,0 +1,19 @@ +cd jni +call ndk-build +if %ERRORLEVEL% EQU 0 ( + cd.. + + mkdir "assets\shaders\base" + xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y + + mkdir "assets\shaders\dynamicuniformbuffer" + xcopy "..\..\data\shaders\dynamicuniformbuffer\*.spv" "assets\shaders\dynamicuniformbuffer" /Y + + mkdir "res\drawable" + xcopy "..\..\android\images\icon.png" "res\drawable" /Y + + call ant debug -Dout.final.file=vulkanDynamicuniformbuffer.apk +) ELSE ( + echo error : ndk-build failed with errors! + cd.. +) diff --git a/android/dynamicuniformbuffer/jni/Android.mk b/android/dynamicuniformbuffer/jni/Android.mk new file mode 100644 index 00000000..f7bb200f --- /dev/null +++ b/android/dynamicuniformbuffer/jni/Android.mk @@ -0,0 +1,48 @@ +LOCAL_PATH := $(call my-dir)/../../dynamicuniformbuffer + +# assimp + +include $(CLEAR_VARS) + +LOCAL_MODULE := assimp +LOCAL_SRC_FILES := $(LOCAL_PATH)/../../libs/assimp/$(TARGET_ARCH_ABI)/libassimp.a +include $(PREBUILT_STATIC_LIBRARY) + +# vulkan example + +DATADIR := $(LOCAL_PATH)/../../data + +include $(CLEAR_VARS) + +LOCAL_MODULE := vulkanDynamicuniformbuffer + +PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../dynamicuniformbuffer/*.cpp) +PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp) + +LOCAL_CPPFLAGS := -std=c++11 +LOCAL_CPPFLAGS += -D__STDC_LIMIT_MACROS +LOCAL_CPPFLAGS += -DVK_NO_PROTOTYPES +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR + +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../external/ +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/glm +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/gli +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../external/assimp +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/ +#LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../base/android + +LOCAL_SRC_FILES := $(PROJECT_FILES) + +LOCAL_LDLIBS := -landroid -llog -lz + +LOCAL_DISABLE_FORMAT_STRING_CHECKS := true +LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true + +LOCAL_STATIC_LIBRARIES += android_native_app_glue +LOCAL_STATIC_LIBRARIES += cpufeatures +LOCAL_STATIC_LIBRARIES += libassimp + +include $(BUILD_SHARED_LIBRARY) + +$(call import-module, android/native_app_glue) +$(call import-module, android/cpufeatures) diff --git a/android/dynamicuniformbuffer/jni/Application.mk b/android/dynamicuniformbuffer/jni/Application.mk new file mode 100644 index 00000000..64b21228 --- /dev/null +++ b/android/dynamicuniformbuffer/jni/Application.mk @@ -0,0 +1,6 @@ +APP_PLATFORM := android-19 +APP_ABI := armeabi-v7a +APP_STL := c++_static +APP_CPPFLAGS := -std=c++11 +APP_CPPFLAGS += -fexceptions +NDK_TOOLCHAIN_VERSION := clang \ No newline at end of file diff --git a/android/uninstall-all.bat b/android/uninstall-all.bat index 4b6c3585..5e5c6d02 100644 --- a/android/uninstall-all.bat +++ b/android/uninstall-all.bat @@ -9,6 +9,7 @@ adb uninstall de.saschawillems.vulkanGeometryshader adb uninstall de.saschawillems.vulkanComputeparticles adb uninstall de.saschawillems.vulkanComputenbody adb uninstall de.saschawillems.vulkanComputeshader +adb uninstall de.saschawillems.vulkanDynamicuniformbuffer adb uninstall de.saschawillems.vulkanParallaxmapping adb uninstall de.saschawillems.vulkanBloom adb uninstall de.saschawillems.vulkanGears