From a4a8db5a8a9c55f1cd668ecb1bad8b4f66a68d46 Mon Sep 17 00:00:00 2001 From: Juan Ramos Date: Fri, 6 Oct 2023 11:53:54 -0600 Subject: cmake: Upgrade to C++17 Addresses various other issues with setting compiler flags. CMAKE_C_FLAGS / CMAKE_CXX_FLAGS should NOT be used anymore. Addressed one minor C++17 issue caused by [[nodiscard]]. Remove compiler flags from Application.mk since they weren't needed and will soon be entirely replaced by CMake. closes #711 --- cube/android/jni/Application.mk | 2 -- cube/cube.cpp | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'cube') 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; -- cgit v1.2.3