Added multisampling example to cmake and android build

CMakeLists.txt

@@ -78,6 +78,7 @@ set(EXAMPLES
 	geometryshader
 	instancing
 	mesh
+	multisampling
 	occlusionquery
 	offscreen
 	parallaxmapping

android/build-all.bat

@@ -25,4 +25,5 @@ call _build shadowmappingomni %1
 call _build sphericalenvmapping %1
 call _build radialblur %1
 call _build displacement %1
-call _build raytracing %1
+call _build raytracing %1
+call _build multisampling %1

android/multisampling/.gitignore

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

android/multisampling/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+		package="de.saschawillems.vulkanMultisampling"
+        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="vulkanMultisampling" android:icon="@drawable/icon" android:hasCode="false">
+		<activity android:name="android.app.NativeActivity"
+                android:label="Multisampling"
+                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="vulkanMultisampling" />
+			<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>

android/multisampling/build.bat

@@ -0,0 +1,20 @@
+cd jni
+call ndk-build
+if %ERRORLEVEL% EQU 0 (
+	echo ndk-build has failed, build cancelled
+	cd..
+
+	mkdir "assets\shaders\mesh"
+	xcopy "..\..\data\shaders\mesh\*.spv" "assets\shaders\mesh" /Y
+
+	mkdir "assets\models\voyager"
+	xcopy "..\..\data\models\voyager\*.*" "assets\models\voyager" /Y
+	
+	mkdir "res\drawable"
+	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
+
+	call ant debug -Dout.final.file=vulkanMultisampling.apk
+) ELSE (
+	echo error : ndk-build failed with errors!
+	cd..
+)

android/multisampling/jni/Android.mk

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

android/multisampling/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

android/uninstall-all.bat

@@ -33,6 +33,7 @@ adb uninstall de.saschawillems.vulkanSphericalenvmapping
 adb uninstall de.saschawillems.vulkanRadialblur
 adb uninstall de.saschawillems.vulkanDisplacement
 adb uninstall de.saschawillems.vulkanRaytracing
+adb uninstall de.saschawillems.vulkanMultisampling
 goto finish
 
 :exit