Sync filesystem.h/path.h

2022-07-08 21:57:06 +10:00
parent f89529015c
commit d2ca454576
50 changed files with 1395 additions and 1861 deletions
--- a/src/frontend-common/opengl_host_display.h
+++ b/src/frontend-common/opengl_host_display.h
@@ -1,14 +1,6 @@
 #pragma once
-
-// GLAD has to come first so that Qt doesn't pull in the system GL headers, which are incompatible with glad.
-#include <glad.h>
-
-// Hack to prevent Apple's glext.h headers from getting included via qopengl.h, since we still want to use glad.
-#ifdef __APPLE__
-#define __glext_h_
-#endif
-
 #include "common/gl/context.h"
+#include "common/gl/loader.h"
 #include "common/gl/program.h"
 #include "common/gl/stream_buffer.h"
 #include "common/gl/texture.h"