nox11dep

Author: archibate

CMakeLists.txt

@@ -14,30 +14,21 @@ project(opengltutor
 
 if (PROJECT_BINARY_DIR STREQUAL PROJECT_SOURCE_DIR)
     message(FATAL_ERROR "The binary directory of CMake cannot be the same as source directory! "
-        "Please consider use 'cmake -B build' to specify a different binary directory. "
+        "Do not use 'cmake .'! Please consider use 'cmake -B build' to specify a different binary directory. "
         "Otherwise this project may fail to build, or make Git hard to exclude binary files. "
         "For Windows, it is highly recommended to use Visual Studio as IDE for CMake projects.")
 endif()
 
-if (UNIX AND NOT APPLE)
-    find_package(X11 QUIET)
-    if (X11_FOUND)
-        link_libraries(${X11_LIBRARIES})
-        include_directories(${X11_INCLUDE_DIR})
-    endif()
-    add_definitions(-DCMAKE_FOUND_X11)
-endif()
-
 if (NOT MSVC)
-    find_program(CCACHE_PROGRAM ccache)  # See https://ccache.dev
+    find_program(CCACHE_PROGRAM ccache)  # Compilation speed up: https://ccache.dev
     if (CCACHE_PROGRAM)
         message(STATUS "Found CCache: ${CCACHE_PROGRAM}")
         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_PROGRAM})
         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_PROGRAM})
     endif()
 endif()
 
-if (MSVC)
+if (MSVC)  # 1. fix string literial cannot include unicode characters; 2. rid min and max macros; 3. get back M_PI, M_E macros
     add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/utf-8$<SEMICOLON>/DNOMINMAX$<SEMICOLON>/D_USE_MATH_DEFINES>)
     add_compile_options($<$<COMPILE_LANG_AND_ID:C,MSVC>:/utf-8$<SEMICOLON>/DNOMINMAX$<SEMICOLON>/D_USE_MATH_DEFINES>)
 endif()

src/check_gl.cpp

@@ -48,107 +48,52 @@ static void APIENTRY opengl_debug_message_callback(
     GLenum severity, GLsizei length,
     const GLchar *msg, const void *data)
 {
-    const char *_source;
-    const char *_type;
-    const char *_severity;
+    if (severity == GL_DEBUG_SEVERITY_NOTIFICATION) return;
 
-    switch (source) {
-    case GL_DEBUG_SOURCE_API:
-        _source = "API";
-        break;
-
-    case GL_DEBUG_SOURCE_WINDOW_SYSTEM:
-        _source = "WINDOW SYSTEM";
-        break;
-
-    case GL_DEBUG_SOURCE_SHADER_COMPILER:
-        _source = "SHADER COMPILER";
-        break;
-
-    case GL_DEBUG_SOURCE_THIRD_PARTY:
-        _source = "THIRD PARTY";
-        break;
-
-    case GL_DEBUG_SOURCE_APPLICATION:
-        _source = "APPLICATION";
-        break;
+    const char *_source = "???";
+    const char *_type = "???";
+    const char *_severity = "???";
 
-    case GL_DEBUG_SOURCE_OTHER:
-        _source = "UNKNOWN";
-        break;
-
-    default:
-        _source = "UNKNOWN";
-        break;
-    }
+    switch (source) {
+#define PER_GL_DEBUG_SOURCE(x) case GL_DEBUG_SOURCE_##x: _source = #x; break;
+    PER_GL_DEBUG_SOURCE(API)
+    PER_GL_DEBUG_SOURCE(WINDOW_SYSTEM)
+    PER_GL_DEBUG_SOURCE(SHADER_COMPILER)
+    PER_GL_DEBUG_SOURCE(THIRD_PARTY)
+    PER_GL_DEBUG_SOURCE(APPLICATION)
+    PER_GL_DEBUG_SOURCE(OTHER)
+#undef PER_GL_DEBUG_SOURCE
+    };
 
     switch (type) {
-    case GL_DEBUG_TYPE_ERROR:
-        _type = "ERROR";
-        break;
-
-    case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
-        _type = "DEPRECATED BEHAVIOR";
-        break;
-
-    case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
-        _type = "UDEFINED BEHAVIOR";
-        break;
-
-    case GL_DEBUG_TYPE_PORTABILITY:
-        _type = "PORTABILITY";
-        break;
-
-    case GL_DEBUG_TYPE_PERFORMANCE:
-        _type = "PERFORMANCE";
-        break;
-
-    case GL_DEBUG_TYPE_OTHER:
-        _type = "OTHER";
-        break;
-
-    case GL_DEBUG_TYPE_MARKER:
-        _type = "MARKER";
-        break;
-
-    default:
-        _type = "UNKNOWN";
-        break;
+#define PER_GL_DEBUG_TYPE(x) case GL_DEBUG_TYPE_##x: _type = #x; break;
+    PER_GL_DEBUG_TYPE(ERROR)
+    PER_GL_DEBUG_TYPE(UNDEFINED_BEHAVIOR)
+    PER_GL_DEBUG_TYPE(PORTABILITY)
+    PER_GL_DEBUG_TYPE(PERFORMANCE)
+    PER_GL_DEBUG_TYPE(OTHER)
+    PER_GL_DEBUG_TYPE(MARKER)
+#undef PER_GL_DEBUG_TYPE
     }
 
     switch (severity) {
-    case GL_DEBUG_SEVERITY_HIGH:
-        _severity = "HIGH";
-        break;
-
-    case GL_DEBUG_SEVERITY_MEDIUM:
-        _severity = "MEDIUM";
-        break;
-
-    case GL_DEBUG_SEVERITY_LOW:
-        _severity = "LOW";
-        break;
-
-    case GL_DEBUG_SEVERITY_NOTIFICATION:
-        _severity = "NOTIFICATION";
-        break;
-
-    default:
-        _severity = "UNKNOWN";
-        break;
+#define PER_GL_DEBUG_SEVERITY(x) case GL_DEBUG_SEVERITY_##x: _severity = #x; break;
+    PER_GL_DEBUG_SEVERITY(HIGH)
+    PER_GL_DEBUG_SEVERITY(MEDIUM)
+    PER_GL_DEBUG_SEVERITY(LOW)
+    PER_GL_DEBUG_SEVERITY(NOTIFICATION)
+#undef PER_GL_DEBUG_SEVERITY
     }
 
-    if (severity != GL_DEBUG_SEVERITY_NOTIFICATION) {
-        fprintf(stderr, "OpenGL error [%d]: %s of %s severity, raised from %s: %s\n",
-                id, _type, _severity, _source, msg);
-/* #ifndef NDEBUG */
-/* #if defined(_MSC_VER) */
-/*         __debugbreak(); */
-/* #elif defined(__GNUC__) */
-/*         __builtin_trap(); */
-/* #endif */
-/* #endif */
-    }
+    fprintf(stderr, "OpenGL error [%d]: %s of %s severity, raised from %s: %s\n",
+            id, _type, _severity, _source, msg);
+    /* #ifndef NDEBUG */
+    /* #if defined(_MSC_VER) */
+    /*         __debugbreak(); */
+    /* #elif defined(__GNUC__) */
+    /*         __builtin_trap(); */
+    /* #endif */
+    /* #endif */
 }
 
 void check_gl::opengl_try_enable_debug_message() {

src/main.cpp

@@ -1,10 +1,5 @@
 #include "check_gl.hpp"
 #include <iostream>
-#ifdef CMAKE_FOUND_X11
-#define GLFW_EXPOSE_NATIVE_X11
-#include <GLFW/glfw3native.h>
-#include <X11/extensions/shape.h>
-#endif
 #include "Game.hpp"
 
 template <class ...Ts>
@@ -41,6 +36,8 @@ int main() {
         glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
 #endif
     }
+
+    // enable 4x MSAA
     glfwWindowHint(GLFW_SAMPLES, 4);
 
     // Enable transparent framebuffer
@@ -91,21 +88,6 @@ int main() {
         }
     }
 
-#ifdef CMAKE_FOUND_X11
-    // Setup mouse click-through
-    if (transparent) {
-        auto dpy = glfwGetX11Display();
-        int shape_event_base, shape_error_base;
-        if (XShapeQueryExtension(dpy, &shape_event_base, &shape_error_base)) {
-            auto win = glfwGetX11Window(window);
-            Region region = XCreateRegion();
-            XShapeCombineRegion(dpy, win, ShapeInput, 0, 0, region, ShapeSet);
-            XDestroyRegion(region);
-            XFlush(dpy);
-        }
-    }
-#endif
-
     // Load glXXX function pointers (only after this you may use OpenGL functions)
     if (!gladLoadGLLoader((GLADloadproc)glfwGetProcAddress)) {
         glfwTerminate();