diff --git a/android/build-all.bat b/android/build-all.bat index f5f00b28..4e0286a4 100644 --- a/android/build-all.bat +++ b/android/build-all.bat @@ -33,4 +33,5 @@ call _build debugmarker %1 call _build scenerendering %1 call _build terraintessellation %1 call _build deferredshadows %1 -call _build indirectdraw %1 \ No newline at end of file +call _build indirectdraw %1 +call _build texturemipmapgen %1 \ No newline at end of file diff --git a/android/texturemipmapgen/.gitignore b/android/texturemipmapgen/.gitignore new file mode 100644 index 00000000..7a5d249c --- /dev/null +++ b/android/texturemipmapgen/.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/texturemipmapgen/AndroidManifest.xml b/android/texturemipmapgen/AndroidManifest.xml new file mode 100644 index 00000000..24eda5c6 --- /dev/null +++ b/android/texturemipmapgen/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/android/texturemipmapgen/build.bat b/android/texturemipmapgen/build.bat new file mode 100644 index 00000000..4f2540ca --- /dev/null +++ b/android/texturemipmapgen/build.bat @@ -0,0 +1,25 @@ +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\texturemipmapgen" + xcopy "..\..\data\shaders\texturemipmapgen\*.spv" "assets\shaders\texturemipmapgen" /Y + + mkdir "assets\textures" + xcopy "..\..\data\textures\checkerboard_nomips_rgba.ktx" "assets\textures" /Y + + mkdir "assets\models" + xcopy "..\..\data\models\tunnel.dae" "assets\models" /Y + + mkdir "res\drawable" + xcopy "..\..\android\images\icon.png" "res\drawable" /Y + + call ant debug -Dout.final.file=vulkanTexturemipmapgen.apk +) ELSE ( + echo error : ndk-build failed with errors! + cd.. +) diff --git a/android/texturemipmapgen/jni/Android.mk b/android/texturemipmapgen/jni/Android.mk new file mode 100644 index 00000000..674ddd6a --- /dev/null +++ b/android/texturemipmapgen/jni/Android.mk @@ -0,0 +1,48 @@ +LOCAL_PATH := $(call my-dir)/../../texturemipmapgen + +# 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 := vulkanTexturemipmapgen + +PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../texturemipmapgen/*.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/texturemipmapgen/jni/Application.mk b/android/texturemipmapgen/jni/Application.mk new file mode 100644 index 00000000..62020feb --- /dev/null +++ b/android/texturemipmapgen/jni/Application.mk @@ -0,0 +1,5 @@ +APP_PLATFORM := android-19 +APP_ABI := armeabi-v7a +APP_STL := c++_static +APP_CPPFLAGS := -std=c++11 +NDK_TOOLCHAIN_VERSION := clang diff --git a/android/uninstall-all.bat b/android/uninstall-all.bat index d6a9518b..f0b54d3d 100644 --- a/android/uninstall-all.bat +++ b/android/uninstall-all.bat @@ -41,6 +41,7 @@ adb uninstall de.saschawillems.vulkanScenerendering adb uninstall de.saschawillems.vulkanTerraintessellation adb uninstall de.saschawillems.vulkanDeferredshadows adb uninstall de.saschawillems.vulkanIndirectdraw +adb uninstall de.saschawillems.vulkanTexturemipmapgen goto finish :exit