From 264705056e95a6d9e5b935af30a8f387132eccf1 Mon Sep 17 00:00:00 2001 From: Daniel Chappuis Date: Mon, 9 Nov 2020 22:47:17 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20issue=20when=20building=20the=20testbed?= =?UTF-8?q?=20application=20on=20MacOS=C2=A0X?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- testbed/CMakeLists.txt | 1 + testbed/src/TestbedApplication.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/testbed/CMakeLists.txt b/testbed/CMakeLists.txt index ffb813c5..80b3a0c3 100755 --- a/testbed/CMakeLists.txt +++ b/testbed/CMakeLists.txt @@ -8,6 +8,7 @@ project(Testbed) set(NANOGUI_BUILD_EXAMPLES OFF CACHE BOOL " " FORCE) set(NANOGUI_BUILD_PYTHON OFF CACHE BOOL " " FORCE) set(NANOGUI_INSTALL OFF CACHE BOOL " " FORCE) +set(NANOGUI_BACKEND OpenGL CACHE BOOL " " FORCE) # ---- Make sure to recursively clone all the git submodules for external libraries (nanogui) --- # find_package(Git QUIET) diff --git a/testbed/src/TestbedApplication.cpp b/testbed/src/TestbedApplication.cpp index 34ddab7f..49c5d000 100755 --- a/testbed/src/TestbedApplication.cpp +++ b/testbed/src/TestbedApplication.cpp @@ -95,12 +95,15 @@ void TestbedApplication::init() { glGetIntegerv(GL_MAJOR_VERSION, &glMajorVersion); glGetIntegerv(GL_MINOR_VERSION, &glMinorVersion); +#ifdef GL_DEBUG_OUTPUT + if (glMajorVersion > 4 || (glMajorVersion == 4 && glMinorVersion >= 3)) { // Enable OpenGL error reporting glEnable(GL_DEBUG_OUTPUT); glDebugMessageCallback(onOpenGLError, 0); } +#endif mIsInitialized = true; } @@ -307,6 +310,7 @@ void TestbedApplication::notifyEngineSetttingsChanged() { void GLAPIENTRY TestbedApplication::onOpenGLError(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam ) { +#ifdef GL_DEBUG_OUTPUT if (type == GL_DEBUG_TYPE_ERROR) { /* fprintf( stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n", @@ -314,6 +318,8 @@ void GLAPIENTRY TestbedApplication::onOpenGLError(GLenum source, GLenum type, GL type, severity, message ); */ } +#endif + } // Compute the FPS