Sync filesystem.h/path.h

src/common/gl/context.cpp

@@ -1,6 +1,6 @@
 #include "context.h"
 #include "../log.h"
-#include "glad.h"
+#include "loader.h"
 #include <cstdlib>
 #ifdef __APPLE__
 #include <stdlib.h>

src/common/gl/context_agl.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "context.h"
-#include <glad.h>
+#include "loader.h"
 
 #if defined(__APPLE__) && defined(__OBJC__)
 #import <AppKit/AppKit.h>

src/common/gl/context_agl.mm

@@ -1,7 +1,7 @@
 #include "context_agl.h"
 #include "../assert.h"
 #include "../log.h"
-#include "glad.h"
+#include "loader.h"
 #include <dlfcn.h>
 Log_SetChannel(GL::ContextAGL);
 

src/common/gl/context_wgl.cpp

@@ -1,11 +1,11 @@
 #include "context_wgl.h"
 #include "../assert.h"
 #include "../log.h"
-#include "glad.h"
-#include "glad_wgl.h"
+#include "loader.h"
 Log_SetChannel(GL::ContextWGL);
 
 // TODO: get rid of this
+#include "glad_wgl.h"
 #pragma comment(lib, "opengl32.lib")
 
 static void* GetProcAddressCallback(const char* name)

src/common/gl/context_wgl.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "../windows_headers.h"
 #include "context.h"
-#include <glad.h>
+#include "loader.h"
 
 namespace GL {
 

src/common/gl/loader.h

@@ -0,0 +1,8 @@
+#pragma once
+
+// Fix glad.h including windows.h
+#ifdef _WIN32
+#include "../windows_headers.h"
+#endif
+
+#include "glad.h"

src/common/gl/program.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../types.h"
-#include "glad.h"
+#include "loader.h"
 #include <string_view>
 #include <vector>
 

src/common/gl/stream_buffer.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../types.h"
-#include <glad.h>
+#include "loader.h"
 #include <memory>
 #include <tuple>
 #include <vector>

src/common/gl/texture.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "../types.h"
-#include <glad.h>
+#include "loader.h"
 
 namespace GL {
 class Texture