diff --git a/examples/android/android-simple/app/build.gradle b/examples/android/android-simple/app/build.gradle index 34bde80dc..8d2abc372 100644 --- a/examples/android/android-simple/app/build.gradle +++ b/examples/android/android-simple/app/build.gradle @@ -17,7 +17,12 @@ android { externalNativeBuild { cmake { abiFilters "armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64' - arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', '-DKOMPUTE_OPT_ANDOID_BUILD=1', '-DKOMPUTE_OPT_INSTALL=0', '-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1' + arguments '-DANDROID_TOOLCHAIN=clang', + '-DANDROID_STL=c++_static', + '-DKOMPUTE_OPT_ANDOID_BUILD=1', + '-DKOMPUTE_OPT_INSTALL=0', + '-DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1', + '-DKOMPUTE_OPT_DISABLE_VK_DEBUG_LAYERS=1' } } } diff --git a/examples/android/android-simple/app/src/main/jni/CMakeLists.txt b/examples/android/android-simple/app/src/main/jni/CMakeLists.txt index 695a14d6e..9e4c2c1fb 100644 --- a/examples/android/android-simple/app/src/main/jni/CMakeLists.txt +++ b/examples/android/android-simple/app/src/main/jni/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories( # * -DUSE_DEBUG_EXTENTIONS # * -Wno-unused-variable set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 \ - -DVK_USE_PLATFORM_ANDROID_KHR -DUSE_DEBUG_EXTENTIONS") + -DVK_USE_PLATFORM_ANDROID_KHR=1 -DKOMPUTE_DISABLE_VK_DEBUG_LAYERS=1") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -u ANativeActivity_onCreate") diff --git a/examples/android/android-simple/app/src/main/jni/main.cpp b/examples/android/android-simple/app/src/main/jni/main.cpp index 392e49096..08ef28842 100644 --- a/examples/android/android-simple/app/src/main/jni/main.cpp +++ b/examples/android/android-simple/app/src/main/jni/main.cpp @@ -215,16 +215,6 @@ bool initialize(android_app* app) { CALL_VK( vkCreateDevice(tutorialGpu, &deviceCreateInfo, nullptr, &tutorialDevice)); - VkInstance tutorialInstance; - VkPhysicalDevice tutorialGpu; - VkDevice tutorialDevice; - - std::shared_ptr tutorialInstanceHpp = std::make_shared(tutorialInstance); - std::shared_ptr tutorialGpuHpp = std::make_shared(tutorialGpu); - std::shared_ptr tutorialDeviceHpp = std::make_shared(tutorialDevice); -// -// kp::Manager mgr(tutorialInstanceHpp, tutorialGpuHpp, tutorialDeviceHpp, 0); - LOGI("BEFORE RUNNING"); kp::Manager mgr;