Added Android and CMake builds for specialization constants example

This commit is contained in:
saschawillems 2017-01-01 15:56:44 +01:00
parent 00b5ea453f
commit 3d9350d960
8 changed files with 117 additions and 1 deletions

View file

@ -127,6 +127,7 @@ set(EXAMPLES
shadowmapping
shadowmappingomni
skeletalanimation
specializationconstants
sphericalenvmapping
ssao
subpasses

View file

@ -38,4 +38,5 @@ call _build terraintessellation %1
call _build deferredshadows %1
call _build indirectdraw %1
call _build texturemipmapgen %1
call _build texture3d %1
call _build texture3d %1
call _build specializationconstants %1

View file

@ -0,0 +1,10 @@
/assets/
/res/
/bin/
/libs/
/obj/
/build.xml
/local.properties
/project.properties
/proguard-project.txt
*.apk

View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.saschawillems.vulkanSpecializationconstants"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="19" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-feature android:name="android.hardware.gamepad" android:required="false"/>
<uses-feature android:name="android.software.leanback" android:required="false"/>
<application android:label="vulkanSpecializationconstants" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity"
android:label="Specialization constants"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden">
<meta-data android:name="android.app.lib_name" android:value="vulkanSpecializationconstants" />
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>

View file

@ -0,0 +1,22 @@
call ndk-build
if %ERRORLEVEL% EQU 0 (
mkdir "assets\shaders\base"
xcopy "..\..\data\shaders\base\*.spv" "assets\shaders\base" /Y
mkdir "assets\shaders\specializationconstants"
xcopy "..\..\data\shaders\specializationconstants\*.spv" "assets\shaders\specializationconstants" /Y
mkdir "assets\models"
xcopy "..\..\data\models\color_teapot_spheres.dae" "assets\models" /Y
mkdir "assets\textures"
xcopy "..\..\data\textures\metalplate_nomips_rgba.ktx" "assets\textures" /Y
mkdir "res\drawable"
xcopy "..\images\icon.png" "res\drawable" /Y
call ant debug -Dout.final.file=vulkanSpecializationconstants.apk
) ELSE (
echo error : ndk-build failed with errors!
cd..
)

View file

@ -0,0 +1,48 @@
LOCAL_PATH := $(call my-dir)/../../specializationconstants
# 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 := vulkanSpecializationconstants
PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../specializationconstants/*.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)

View file

@ -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

View file

@ -45,6 +45,7 @@ adb uninstall de.saschawillems.vulkanDeferredshadows
adb uninstall de.saschawillems.vulkanIndirectdraw
adb uninstall de.saschawillems.vulkanTexturemipmapgen
adb uninstall de.saschawillems.vulkanTexture3d
adb uninstall de.saschawillems.vulkanSpecializationconstants
goto finish
:exit