misc: Switch from gl3w to glad

Also add more checks on window and context creation.

CMakeLists.txt

@@ -18,7 +18,6 @@ include_directories(${PROJECT_SOURCE_DIR}/include/kernel)
 include_directories (${FMT_INCLUDE_DIR})
 include_directories(third_party/boost/)
 include_directories(third_party/elfio/)
-include_directories(third_party/gl3w/)
 include_directories(third_party/imgui/)
 include_directories(third_party/dynarmic/src)
 include_directories(third_party/cryptopp/)
@@ -30,6 +29,7 @@ add_compile_definitions(SDL_MAIN_HANDLED)
 set(SDL_STATIC ON CACHE BOOL "" FORCE)
 set(SDL_SHARED OFF CACHE BOOL "" FORCE)
 add_subdirectory(third_party/SDL2)
+add_subdirectory(third_party/glad)
 include_directories(${SDL2_INCLUDE_DIR})
 
 set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/third_party/boost")
@@ -122,7 +122,6 @@ set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp
                              third_party/imgui/imgui_tables.cpp
                              third_party/imgui/imgui_widgets.cpp
                              third_party/imgui/imgui_demo.cpp
-                             third_party/gl3w/gl3w.cpp
 )
 
 source_group("Header Files\\Core" FILES ${HEADER_FILES})
@@ -137,4 +136,4 @@ source_group("Source Files\\Third Party" FILES ${THIRD_PARTY_SOURCE_FILES})
 
 add_executable(Alber ${SOURCE_FILES} ${FS_SOURCE_FILES} ${KERNEL_SOURCE_FILES} ${LOADER_SOURCE_FILES} ${SERVICE_SOURCE_FILES}
 ${PICA_SOURCE_FILES} ${RENDERER_GL_SOURCE_FILES} ${THIRD_PARTY_SOURCE_FILES} ${HEADER_FILES})
-target_link_libraries(Alber PRIVATE dynarmic SDL2-static)
+target_link_libraries(Alber PRIVATE dynarmic SDL2-static glad)

include/emulator.hpp

@@ -3,6 +3,7 @@
 #include <filesystem>
 #include <fstream>
 #include <SDL.h>
+#include <glad/gl.h>
 
 #include "cpu.hpp"
 #include "io_file.hpp"
@@ -35,7 +36,7 @@ class Emulator {
 
 public:
     Emulator() : kernel(cpu, memory, gpu), cpu(memory, kernel), gpu(memory), memory(cpu.getTicksRef()) {
-        if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+        if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) < 0) {
             Helpers::panic("Failed to initialize SDL2");
         }
 
@@ -45,8 +46,21 @@ public:
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
         window = SDL_CreateWindow("Alber", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, SDL_WINDOW_OPENGL);
+
+        if (window == nullptr) {
+            Helpers::panic("Window creation failed: %s", SDL_GetError());
+        }
+
         glContext = SDL_GL_CreateContext(window);
 
+        if (glContext == nullptr) {
+            Helpers::panic("OpenGL context creation failed: %s", SDL_GetError());
+        }
+
+        if(!gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress))) {
+            Helpers::panic("OpenGL init failed: %s", SDL_GetError());
+        }
+
         reset();
     }
 

include/opengl.hpp

@@ -28,7 +28,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "gl3w.h"
+#include <glad/gl.h>
 
 // Check if we have C++20. If yes, we can add C++20 std::span support
 #ifdef _MSVC_LANG // MSVC does not properly define __cplusplus without a compiler flag...
@@ -523,8 +523,6 @@ namespace OpenGL {
     static GLint getProgram() { return get<GLint>(GL_CURRENT_PROGRAM); }
     static bool scissorEnabled() { return isEnabled(GL_SCISSOR_TEST); }
 
-    static bool versionSupported(int major, int minor) { return gl3wIsSupported(major, minor); }
-
     [[nodiscard]] static GLint uniformLocation(GLuint program, const char* name) {
         return glGetUniformLocation(program, name);
     }

src/main.cpp

@@ -1,11 +1,7 @@
 #include "emulator.hpp"
-#include "gl3w.h"
 
 int main (int argc, char *argv[]) {
     Emulator emu;
-    if (gl3wInit()) {
-        Helpers::panic("Failed to initialize OpenGL");
-    }
 
     emu.initGraphicsContext();
 

third_party/glad/CMakeLists.txt

@@ -0,0 +1,7 @@
+add_library(glad STATIC
+    src/gl.c
+    include/glad/gl.h
+    include/KHR/khrplatform.h
+)
+
+target_include_directories(glad PUBLIC "include")

third_party/glad/README.md

@@ -0,0 +1,7 @@
+# glad
+
+This was generated with [glad2](https://github.com/Dav1dde/glad) using the following command:
+
+```bash
+python -m glad --api gl:core=4.3 --out-path glad --reproducible c --loader
+```

third_party/glad/include/KHR/khrplatform.h

@@ -94,14 +94,14 @@
 #   define KHRONOS_STATIC 1
 #endif
 
- /*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-  * Definition of KHRONOS_APICALL
+ * Definition of KHRONOS_APICALL
-  *-------------------------------------------------------------------------
+ *-------------------------------------------------------------------------
-  * This precedes the return type of the function in the function prototype.
+ * This precedes the return type of the function in the function prototype.
-  */
+ */
 #if defined(KHRONOS_STATIC)
-  /* If the preprocessor constant KHRONOS_STATIC is defined, make the
+    /* If the preprocessor constant KHRONOS_STATIC is defined, make the
-   * header compatible with static linking. */
+     * header compatible with static linking. */
 #   define KHRONOS_APICALL
 #elif defined(_WIN32)
 #   define KHRONOS_APICALL __declspec(dllimport)
@@ -113,39 +113,39 @@
 #   define KHRONOS_APICALL
 #endif
 
-  /*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-   * Definition of KHRONOS_APIENTRY
+ * Definition of KHRONOS_APIENTRY
-   *-------------------------------------------------------------------------
+ *-------------------------------------------------------------------------
-   * This follows the return type of the function  and precedes the function
+ * This follows the return type of the function  and precedes the function
-   * name in the function prototype.
+ * name in the function prototype.
-   */
+ */
 #if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
-   /* Win32 but not WinCE */
+    /* Win32 but not WinCE */
 #   define KHRONOS_APIENTRY __stdcall
 #else
 #   define KHRONOS_APIENTRY
 #endif
 
-   /*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-    * Definition of KHRONOS_APIATTRIBUTES
+ * Definition of KHRONOS_APIATTRIBUTES
-    *-------------------------------------------------------------------------
+ *-------------------------------------------------------------------------
-    * This follows the closing parenthesis of the function prototype arguments.
+ * This follows the closing parenthesis of the function prototype arguments.
-    */
+ */
 #if defined (__ARMCC_2__)
 #define KHRONOS_APIATTRIBUTES __softfp
 #else
 #define KHRONOS_APIATTRIBUTES
 #endif
 
-    /*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
-     * basic type definitions
+ * basic type definitions
-     *-----------------------------------------------------------------------*/
+ *-----------------------------------------------------------------------*/
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
 
 
-     /*
+/*
-      * Using <stdint.h>
+ * Using <stdint.h>
-      */
+ */
 #include <stdint.h>
 typedef int32_t                 khronos_int32_t;
 typedef uint32_t                khronos_uint32_t;
@@ -170,9 +170,9 @@ typedef uint64_t                khronos_uint64_t;
 
 #elif defined(__VMS ) || defined(__sgi)
 
-     /*
+/*
-      * Using <inttypes.h>
+ * Using <inttypes.h>
-      */
+ */
 #include <inttypes.h>
 typedef int32_t                 khronos_int32_t;
 typedef uint32_t                khronos_uint32_t;
@@ -183,9 +183,9 @@ typedef uint64_t                khronos_uint64_t;
 
 #elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
 
-     /*
+/*
-      * Win32
+ * Win32
-      */
+ */
 typedef __int32                 khronos_int32_t;
 typedef unsigned __int32        khronos_uint32_t;
 typedef __int64                 khronos_int64_t;
@@ -195,9 +195,9 @@ typedef unsigned __int64        khronos_uint64_t;
 
 #elif defined(__sun__) || defined(__digital__)
 
-     /*
+/*
-      * Sun or Digital
+ * Sun or Digital
-      */
+ */
 typedef int                     khronos_int32_t;
 typedef unsigned int            khronos_uint32_t;
 #if defined(__arch64__) || defined(_LP64)
@@ -212,9 +212,9 @@ typedef unsigned long long int  khronos_uint64_t;
 
 #elif 0
 
-     /*
+/*
-      * Hypothetical platform with no float or int64 support
+ * Hypothetical platform with no float or int64 support
-      */
+ */
 typedef int                     khronos_int32_t;
 typedef unsigned int            khronos_uint32_t;
 #define KHRONOS_SUPPORT_INT64   0
@@ -222,9 +222,9 @@ typedef unsigned int            khronos_uint32_t;
 
 #else
 
-     /*
+/*
-      * Generic fallback
+ * Generic fallback
-      */
+ */
 #include <stdint.h>
 typedef int32_t                 khronos_int32_t;
 typedef uint32_t                khronos_uint32_t;
@@ -296,15 +296,15 @@ typedef khronos_int64_t        khronos_stime_nanoseconds_t;
 #define KHRONOS_MAX_ENUM 0x7FFFFFFF
 #endif
 
- /*
+/*
-  * Enumerated boolean type
+ * Enumerated boolean type
-  *
+ *
-  * Values other than zero should be considered to be true.  Therefore
+ * Values other than zero should be considered to be true.  Therefore
-  * comparisons should not be made against KHRONOS_TRUE.
+ * comparisons should not be made against KHRONOS_TRUE.
-  */
+ */
 typedef enum {
     KHRONOS_FALSE = 0,
-    KHRONOS_TRUE = 1,
+    KHRONOS_TRUE  = 1,
     KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
 } khronos_boolean_enum_t;