diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-04-26 19:59:19 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-04-28 14:01:42 -0600 |
| commit | 8707a6e63c14786a005e4a3c612fa5f941020ffa (patch) | |
| tree | c4003c57c4f93728ee1dc7a346c4b6d60c6b203f | |
| parent | 59e9c666b0b4a10181b64f41d8759767bdd8c4a7 (diff) | |
| download | usermoji-8707a6e63c14786a005e4a3c612fa5f941020ffa.tar.xz | |
android: Start using vulkan_wrapper in cube and tri
| -rw-r--r-- | demos/android/jni/Android.mk | 16 | ||||
| -rw-r--r-- | demos/cube.c | 10 | ||||
| -rw-r--r-- | demos/tri.c | 12 |
3 files changed, 31 insertions, 7 deletions
diff --git a/demos/android/jni/Android.mk b/demos/android/jni/Android.mk index 2f82dd48..d852176e 100644 --- a/demos/android/jni/Android.mk +++ b/demos/android/jni/Android.mk @@ -14,29 +14,31 @@ # limitations under the License. LOCAL_PATH := $(abspath $(call my-dir)) -SRC_DIR := $(LOCAL_PATH)/../../../ +SRC_DIR := $(LOCAL_PATH)/../../.. DEMO_DIR := $(SRC_DIR)/demos include $(CLEAR_VARS) LOCAL_MODULE := Tri -LOCAL_SRC_FILES += $(DEMO_DIR)/tri.c +LOCAL_SRC_FILES += $(DEMO_DIR)/tri.c \ + $(SRC_DIR)/common/vulkan_wrapper.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(DEMO_DIR)/android/include \ $(SRC_DIR)/libs -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue -LOCAL_LDLIBS := -llog -landroid -lvulkan +LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := Cube -LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c +LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \ + $(SRC_DIR)/common/vulkan_wrapper.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(DEMO_DIR)/android/include \ $(SRC_DIR)/libs -LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR +LOCAL_CFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue -LOCAL_LDLIBS := -llog -landroid -lvulkan +LOCAL_LDLIBS := -llog -landroid include $(BUILD_SHARED_LIBRARY) $(call import-module,android/native_app_glue) diff --git a/demos/cube.c b/demos/cube.c index 8fbcf9b6..e8da31ed 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -37,7 +37,11 @@ #define APP_NAME_STR_LEN 80 #endif // _WIN32 +#ifdef ANDROID +#include "vulkan_wrapper.h" +#else #include <vulkan/vulkan.h> +#endif #include <vulkan/vk_sdk_platform.h> #include "linmath.h" @@ -3104,6 +3108,12 @@ void android_main(struct android_app *app) { app_dummy(); +#ifdef ANDROID + int vulkanSupport = InitVulkan(); + if (vulkanSupport == 0) + return; +#endif + app->onAppCmd = processCommand; app->onInputEvent = processInput; diff --git a/demos/tri.c b/demos/tri.c index f7916fcc..288e72c2 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -44,7 +44,11 @@ #define APP_NAME_STR_LEN 80 #endif // _WIN32 +#ifdef ANDROID +#include "vulkan_wrapper.h" +#else #include <vulkan/vulkan.h> +#endif #define DEMO_TEXTURE_COUNT 1 #define VERTEX_BUFFER_BIND_ID 0 @@ -2621,10 +2625,18 @@ static void processCommand(struct android_app* app, int32_t cmd) { } } + + void android_main(struct android_app *app) { app_dummy(); +#ifdef ANDROID + int vulkanSupport = InitVulkan(); + if (vulkanSupport == 0) + return; +#endif + app->onAppCmd = processCommand; app->onInputEvent = processInput; |