Vendor glad library

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(osc VERSION 0.5.17 LANGUAGES CXX)
+project(osc VERSION 0.5.17 LANGUAGES CXX C)
 
 
 # -------------- gather user-facing build cache vars ---------------- #

NOTICE.txt

@@ -79,15 +79,6 @@ googletest
 - Licensed under the BSD 3-Clause "New" or "Revised" License
 - Copyright 2008, Google Inc.
 
-glad
-----
-
-- https://github.com/Dav1dde/glad
-- The `glad` code included in OpenSim Creator, generated via https://glad.dav1d.de/
-  is any of public domain, WTFPL, or CC0 license. The headers also contain code from
-  Khronos, which is Apache 2.0 licensed.
-- Author: David Herberth <github@dav1d.de>
-
 sdl
 ---
 
@@ -137,3 +128,13 @@ ImGuizmo
   it to fix various application-specific issues (e.g. ability to reset the global context)
   in a backwards-compatibility-breaking way. It was then subsequently refactored to match the
   rest of the project.
+
+glad
+----
+
+- https://github.com/Dav1dde/glad
+- The `glad` code included in OpenSim Creator, generated via https://glad.dav1d.de/
+  is any of public domain, WTFPL, or CC0 license. The headers also contain code from
+  Khronos, which is Apache 2.0 licensed.
+- The generated code was copied + pasted into OpenSim Creator's graphics backend
+- Author: David Herberth <github@dav1d.de>

src/README.md

@@ -9,5 +9,5 @@ The libraries are split into several targets. The intent of each is:
 | Directory | Description | Depends on |
 | - | - | - |
 | `OpenSimCreator/` | Implements the OpenSim Creator UI by integrating [osim](https://github.com/ComputationalBiomechanicsLab/osim) against `oscar`. Also includes the demo tabs for testing/verification. | `oscar`, `oscar_demos`, `osim` |
-| `oscar/` | Core engine for creating scientific tooling UIs | `glad`, `SDL3`, `nativefiledialog`, `imgui`, `implot`, `stb`, `lunasvg`, `tomlplusplus`, `unordered_dense` |
+| `oscar/` | Core engine for creating scientific tooling UIs | `SDL3`, `nativefiledialog`, `imgui`, `implot`, `stb`, `lunasvg`, `tomlplusplus`, `unordered_dense` |
 | `oscar_demos/` | Demos that uses the `oscar` API to provide something interesting/useful, such as implement https://learnopengl.com/ in terms of the `oscar` API | `oscar` |

src/oscar/CMakeLists.txt

@@ -12,7 +12,6 @@ if (NOT ${OSC_EMSCRIPTEN})
     # These libraries are either provided by emscripten later on, or aren't
     # supported by the emscripten build (they're #ifdef'd out in `oscar`'s
     # source code).
-    find_package(glad REQUIRED CONFIG)
     find_package(SDL3 REQUIRED CONFIG)
     find_package(nativefiledialog REQUIRED CONFIG)
 endif()
@@ -114,6 +113,9 @@ add_library(oscar STATIC
     Graphics/Materials/MeshPhongMaterial.cpp
     Graphics/Materials/MeshPhongMaterial.h
 
+    Graphics/OpenGL/Detail/glad.c
+    Graphics/OpenGL/Detail/glad.h
+    Graphics/OpenGL/Detail/khrplatform.h
     Graphics/OpenGL/CPUDataTypeOpenGLTraits.h
     Graphics/OpenGL/CPUImageFormatOpenGLTraits.h
     Graphics/OpenGL/DepthStencilRenderBufferFormatOpenGLTraits.h
@@ -663,7 +665,6 @@ target_include_directories(oscar PUBLIC
 target_link_libraries(oscar PRIVATE
     # these libraries are either provided by emscripten later on, or aren't
     # supported by the emscripten build (they're #ifdef'd out)
-    $<$<NOT:$<BOOL:${OSC_EMSCRIPTEN}>>:glad>
     $<$<NOT:$<BOOL:${OSC_EMSCRIPTEN}>>:SDL3::SDL3>
     $<$<NOT:$<BOOL:${OSC_EMSCRIPTEN}>>:nativefiledialog>
 

src/oscar/Graphics/GraphicsImplementation.cpp

@@ -29,6 +29,7 @@
 #include <oscar/Graphics/Mesh.h>
 #include <oscar/Graphics/MeshFunctions.h>
 #include <oscar/Graphics/MeshTopology.h>
+#include <oscar/Graphics/OpenGL/Detail/glad.h>
 #include <oscar/Graphics/OpenGL/CPUDataTypeOpenGLTraits.h>
 #include <oscar/Graphics/OpenGL/CPUImageFormatOpenGLTraits.h>
 #include <oscar/Graphics/OpenGL/DepthStencilRenderBufferFormatOpenGLHelpers.h>
@@ -89,7 +90,6 @@
 #include <oscar/Utils/UID.h>
 
 #include <ankerl/unordered_dense.h>
-#include <glad/glad.h>
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_opengl.h>
 #include <SDL3/SDL_video.h>

third_party/glad/src/glad.c → src/oscar/Graphics/OpenGL/Detail/glad.c

@@ -637,10 +637,11 @@
         Too many extensions
 */
 
+#include <oscar/Graphics/OpenGL/Detail/glad.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glad/glad.h>
 
 struct gladGLversionStruct GLVersion = { 0, 0 };
 

third_party/glad/include/glad/glad.h → src/oscar/Graphics/OpenGL/Detail/glad.h

@@ -701,7 +701,8 @@ typedef void* (* GLADloadproc)(const char *name);
 GLAPI struct gladGLversionStruct GLVersion;
 GLAPI int gladLoadGLLoader(GLADloadproc);
 
-#include <KHR/khrplatform.h>
+#include <oscar/Graphics/OpenGL/Detail/khrplatform.h>
+
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;

src/oscar/Graphics/OpenGL/Gl.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <oscar/Graphics/OpenGL/Detail/glad.h>
 #include <oscar/Maths/Mat3.h>
 #include <oscar/Maths/Mat4.h>
 #include <oscar/Maths/MatFunctions.h>
@@ -10,8 +11,6 @@
 #include <oscar/Shims/Cpp20/bit.h>
 #include <oscar/Utils/Concepts.h>
 
-#include <glad/glad.h>
-
 #include <concepts>
 #include <cstddef>
 #include <exception>