aboutsummaryrefslogtreecommitdiff
path: root/cube
diff options
context:
space:
mode:
Diffstat (limited to 'cube')
-rw-r--r--cube/android/jni/Application.mk2
-rw-r--r--cube/cube.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/cube/android/jni/Application.mk b/cube/android/jni/Application.mk
index a3d9754e..788ff73b 100644
--- a/cube/android/jni/Application.mk
+++ b/cube/android/jni/Application.mk
@@ -17,6 +17,4 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
APP_PLATFORM := android-23
APP_STL := c++_static
APP_MODULES := VkCube
-APP_CPPFLAGS += -std=c++11 -fexceptions -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
-APP_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -DVK_NO_PROTOTYES -DGLM_FORCE_RADIANS
NDK_TOOLCHAIN_VERSION := clang
diff --git a/cube/cube.cpp b/cube/cube.cpp
index a59e6dbe..005226e6 100644
--- a/cube/cube.cpp
+++ b/cube/cube.cpp
@@ -664,7 +664,8 @@ void Demo::destroy_texture(texture_object &tex_objs) {
void Demo::draw() {
// Ensure no more than FRAME_LAG renderings are outstanding
- device.waitForFences(fences[frame_index], VK_TRUE, UINT64_MAX);
+ const vk::Result wait_result = device.waitForFences(fences[frame_index], VK_TRUE, UINT64_MAX);
+ VERIFY(wait_result == vk::Result::eSuccess || wait_result == vk::Result::eTimeout);
device.resetFences({fences[frame_index]});
vk::Result acquire_result;