Reformat all the things!

28 files changed, 644 insertions, 324 deletions

diff --git a/Source/Core/Common/Analytics.h b/Source/Core/Common/Analytics.h
index f4269d0c67..6015d1d6f3 100644
--- a/Source/Core/Common/Analytics.h
+++ b/Source/Core/Common/Analytics.h
@@ -148,6 +148,7 @@ public:
 
   // For convenience.
   void Send(AnalyticsReportBuilder& report) { Send(std::move(report)); }
+
 protected:
   void ThreadProc();
 
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
index 2ff15df5c6..ff8009c587 100644
--- a/Source/Core/Common/Arm64Emitter.cpp
+++ b/Source/Core/Common/Arm64Emitter.cpp
@@ -201,8 +201,12 @@ bool IsImmLogical(uint64_t value, unsigned int width, unsigned int* n, unsigned
   // (1 + 2^d + 2^(2d) + ...), i.e. 0x0001000100010001 or similar. These can
   // be derived using a table lookup on CLZ(d).
   static const std::array<uint64_t, 6> multipliers = {{
-      0x0000000000000001UL, 0x0000000100000001UL, 0x0001000100010001UL, 0x0101010101010101UL,
-      0x1111111111111111UL, 0x5555555555555555UL,
+      0x0000000000000001UL,
+      0x0000000100000001UL,
+      0x0001000100010001UL,
+      0x0101010101010101UL,
+      0x1111111111111111UL,
+      0x5555555555555555UL,
   }};
 
   int multiplier_idx = CountLeadingZeros(d, kXRegSizeInBits) - 57;
diff --git a/Source/Core/Common/BitField.h b/Source/Core/Common/BitField.h
index 6866282298..108921bdf0 100644
--- a/Source/Core/Common/BitField.h
+++ b/Source/Core/Common/BitField.h
@@ -147,6 +147,7 @@ public:
   constexpr operator T() const { return Value(); }
   constexpr std::size_t StartBit() const { return position; }
   constexpr std::size_t NumBits() const { return bits; }
+
 private:
   // StorageType is T for non-enum types and the underlying type of T if
   // T is an enumeration. Note that T is wrapped within an enable_if in the
diff --git a/Source/Core/Common/BitSet.h b/Source/Core/Common/BitSet.h
index e43ecf9bc7..f8506e7c89 100644
--- a/Source/Core/Common/BitSet.h
+++ b/Source/Core/Common/BitSet.h
@@ -164,6 +164,7 @@ public:
     constexpr int operator*() const { return m_bit; }
     constexpr bool operator==(Iterator other) const { return m_bit == other.m_bit; }
     constexpr bool operator!=(Iterator other) const { return m_bit != other.m_bit; }
+
   private:
     IntTy m_val;
     int m_bit;
diff --git a/Source/Core/Common/BlockingLoop.h b/Source/Core/Common/BlockingLoop.h
index 269297367c..7f6c42ca70 100644
--- a/Source/Core/Common/BlockingLoop.h
+++ b/Source/Core/Common/BlockingLoop.h
@@ -230,6 +230,7 @@ public:
   // This function should be triggered regularly over time so
   // that we will fall back from the busy loop to sleeping.
   void AllowSleep() { m_may_sleep.Set(); }
+
 private:
   std::mutex m_wait_lock;
   std::mutex m_prepare_lock;
diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp
index 86b9c93e40..7b109e81c5 100644
--- a/Source/Core/Common/CommonFuncs.cpp
+++ b/Source/Core/Common/CommonFuncs.cpp
@@ -22,12 +22,12 @@ std::string LastStrerrorString()
 {
   char error_message[BUFFER_SIZE];
 
-// There are two variants of strerror_r. The XSI version stores the message to the passed-in
-// buffer and returns an int (0 on success). The GNU version returns a pointer to the message,
-// which might have been stored in the passed-in buffer or might be a static string.
+  // There are two variants of strerror_r. The XSI version stores the message to the passed-in
+  // buffer and returns an int (0 on success). The GNU version returns a pointer to the message,
+  // which might have been stored in the passed-in buffer or might be a static string.
 
-// We check defines in order to figure out variant is in use, and we store the returned value
-// to a variable so that we'll get a compile-time check that our assumption was correct.
+  // We check defines in order to figure out variant is in use, and we store the returned value
+  // to a variable so that we'll get a compile-time check that our assumption was correct.
 
 #if defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600))
   const char* str = strerror_r(errno, error_message, BUFFER_SIZE);
diff --git a/Source/Core/Common/CompatPatches.cpp b/Source/Core/Common/CompatPatches.cpp
index f835ac2279..b2bc839be3 100644
--- a/Source/Core/Common/CompatPatches.cpp
+++ b/Source/Core/Common/CompatPatches.cpp
@@ -203,8 +203,7 @@ static bool GetModuleVersion(const wchar_t* name, Version* version)
 
 void CompatPatchesInstall(LdrWatcher* watcher)
 {
-  watcher->Install({{L"EZFRD64.dll", L"811EZFRD64.DLL"},
-                    [](const LdrDllLoadEvent& event) {
+  watcher->Install({{L"EZFRD64.dll", L"811EZFRD64.DLL"}, [](const LdrDllLoadEvent& event) {
                       // *EZFRD64 is incldued in software packages for cheapo third-party gamepads
                       // (and gamepad adapters). The module cannot handle its heap being above 4GB,
                       // which tends to happen very often on modern Windows.
@@ -214,8 +213,7 @@ void CompatPatchesInstall(LdrWatcher* watcher)
                       auto patcher = ImportPatcher(event.base_address);
                       patcher.PatchIAT("kernel32.dll", "HeapCreate", HeapCreateLow4GB);
                     }});
-  watcher->Install({{L"ucrtbase.dll"},
-                    [](const LdrDllLoadEvent& event) {
+  watcher->Install({{L"ucrtbase.dll"}, [](const LdrDllLoadEvent& event) {
                       // ucrtbase implements caching between fseek/fread, old versions have a bug
                       // such that some reads return incorrect data. This causes noticable bugs
                       // in dolphin since we use these APIs for reading game images.
diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h
index a5b62f812d..f35653ddff 100644
--- a/Source/Core/Common/Config/Enums.h
+++ b/Source/Core/Common/Config/Enums.h
@@ -34,7 +34,12 @@ enum class System
 };
 
 constexpr std::array<LayerType, 7> SEARCH_ORDER{{
-    LayerType::CurrentRun, LayerType::CommandLine, LayerType::Movie, LayerType::Netplay,
-    LayerType::LocalGame, LayerType::GlobalGame, LayerType::Base,
+    LayerType::CurrentRun,
+    LayerType::CommandLine,
+    LayerType::Movie,
+    LayerType::Netplay,
+    LayerType::LocalGame,
+    LayerType::GlobalGame,
+    LayerType::Base,
 }};
 }
diff --git a/Source/Core/Common/Config/Layer.h b/Source/Core/Common/Config/Layer.h
index 8e56ae308a..c8373c5bce 100644
--- a/Source/Core/Common/Config/Layer.h
+++ b/Source/Core/Common/Config/Layer.h
@@ -69,6 +69,7 @@ public:
   Section(iterator begin_, iterator end_) : m_begin(begin_), m_end(end_) {}
   iterator begin() const { return m_begin; }
   iterator end() const { return m_end; }
+
 private:
   iterator m_begin;
   iterator m_end;
@@ -81,6 +82,7 @@ public:
   ConstSection(iterator begin_, iterator end_) : m_begin(begin_), m_end(end_) {}
   iterator begin() const { return m_begin; }
   iterator end() const { return m_end; }
+
 private:
   iterator m_begin;
   iterator m_end;
diff --git a/Source/Core/Common/DebugInterface.h b/Source/Core/Common/DebugInterface.h
index d4459f0272..9b66f30a8e 100644
--- a/Source/Core/Common/DebugInterface.h
+++ b/Source/Core/Common/DebugInterface.h
@@ -12,6 +12,7 @@ class DebugInterface
 {
 protected:
   virtual ~DebugInterface() {}
+
 public:
   virtual std::string Disassemble(unsigned int /*address*/) { return "NODEBUGGER"; }
   virtual std::string GetRawMemoryString(int /*memory*/, unsigned int /*address*/)
diff --git a/Source/Core/Common/FixedSizeQueue.h b/Source/Core/Common/FixedSizeQueue.h
index b8fb345fb1..267b3d8c4b 100644
--- a/Source/Core/Common/FixedSizeQueue.h
+++ b/Source/Core/Common/FixedSizeQueue.h
@@ -51,6 +51,7 @@ public:
   T& front() { return storage[head]; }
   const T& front() const { return storage[head]; }
   size_t size() const { return count; }
+
 private:
   std::array<T, N> storage;
   int head = 0;
diff --git a/Source/Core/Common/Flag.h b/Source/Core/Common/Flag.h
index 31573aaced..44dc25a4cd 100644
--- a/Source/Core/Common/Flag.h
+++ b/Source/Core/Common/Flag.h
@@ -38,6 +38,7 @@ public:
   }
 
   bool TestAndClear() { return TestAndSet(false); }
+
 private:
   std::atomic_bool m_val;
 };
diff --git a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
index f326e46365..9252a7bed3 100644
--- a/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
+++ b/Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
@@ -1041,301 +1041,566 @@ struct GLFunc
 
 const GLFunc gl_function_array[] = {
     // gl_1_1
-    GLFUNC_ALWAYS_REQUIRED(glClearIndex), GLFUNC_ALWAYS_REQUIRED(glIndexMask),
-    GLFUNC_ALWAYS_REQUIRED(glAlphaFunc), GLFUNC_ALWAYS_REQUIRED(glLogicOp),
-    GLFUNC_ALWAYS_REQUIRED(glPointSize), GLFUNC_ALWAYS_REQUIRED(glLineStipple),
-    GLFUNC_ALWAYS_REQUIRED(glPolygonMode), GLFUNC_ALWAYS_REQUIRED(glPolygonStipple),
-    GLFUNC_ALWAYS_REQUIRED(glGetPolygonStipple), GLFUNC_ALWAYS_REQUIRED(glEdgeFlag),
-    GLFUNC_ALWAYS_REQUIRED(glEdgeFlagv), GLFUNC_ALWAYS_REQUIRED(glClipPlane),
-    GLFUNC_ALWAYS_REQUIRED(glGetClipPlane), GLFUNC_ALWAYS_REQUIRED(glDrawBuffer),
-    GLFUNC_ALWAYS_REQUIRED(glEnableClientState), GLFUNC_ALWAYS_REQUIRED(glDisableClientState),
-    GLFUNC_ALWAYS_REQUIRED(glGetDoublev), GLFUNC_ALWAYS_REQUIRED(glPushAttrib),
-    GLFUNC_ALWAYS_REQUIRED(glPopAttrib), GLFUNC_ALWAYS_REQUIRED(glPushClientAttrib),
-    GLFUNC_ALWAYS_REQUIRED(glPopClientAttrib), GLFUNC_ALWAYS_REQUIRED(glRenderMode),
-    GLFUNC_ALWAYS_REQUIRED(glClearDepth), GLFUNC_ALWAYS_REQUIRED(glDepthRange),
-    GLFUNC_ALWAYS_REQUIRED(glClearAccum), GLFUNC_ALWAYS_REQUIRED(glAccum),
-    GLFUNC_ALWAYS_REQUIRED(glMatrixMode), GLFUNC_ALWAYS_REQUIRED(glOrtho),
-    GLFUNC_ALWAYS_REQUIRED(glFrustum), GLFUNC_ALWAYS_REQUIRED(glPushMatrix),
-    GLFUNC_ALWAYS_REQUIRED(glPopMatrix), GLFUNC_ALWAYS_REQUIRED(glLoadIdentity),
-    GLFUNC_ALWAYS_REQUIRED(glLoadMatrixd), GLFUNC_ALWAYS_REQUIRED(glLoadMatrixf),
-    GLFUNC_ALWAYS_REQUIRED(glMultMatrixd), GLFUNC_ALWAYS_REQUIRED(glMultMatrixf),
-    GLFUNC_ALWAYS_REQUIRED(glRotated), GLFUNC_ALWAYS_REQUIRED(glRotatef),
-    GLFUNC_ALWAYS_REQUIRED(glScaled), GLFUNC_ALWAYS_REQUIRED(glScalef),
-    GLFUNC_ALWAYS_REQUIRED(glTranslated), GLFUNC_ALWAYS_REQUIRED(glTranslatef),
-    GLFUNC_ALWAYS_REQUIRED(glIsList), GLFUNC_ALWAYS_REQUIRED(glDeleteLists),
-    GLFUNC_ALWAYS_REQUIRED(glGenLists), GLFUNC_ALWAYS_REQUIRED(glNewList),
-    GLFUNC_ALWAYS_REQUIRED(glEndList), GLFUNC_ALWAYS_REQUIRED(glCallList),
-    GLFUNC_ALWAYS_REQUIRED(glCallLists), GLFUNC_ALWAYS_REQUIRED(glListBase),
-    GLFUNC_ALWAYS_REQUIRED(glBegin), GLFUNC_ALWAYS_REQUIRED(glEnd),
-    GLFUNC_ALWAYS_REQUIRED(glVertex2d), GLFUNC_ALWAYS_REQUIRED(glVertex2f),
-    GLFUNC_ALWAYS_REQUIRED(glVertex2i), GLFUNC_ALWAYS_REQUIRED(glVertex2s),
-    GLFUNC_ALWAYS_REQUIRED(glVertex3d), GLFUNC_ALWAYS_REQUIRED(glVertex3f),
-    GLFUNC_ALWAYS_REQUIRED(glVertex3i), GLFUNC_ALWAYS_REQUIRED(glVertex3s),
-    GLFUNC_ALWAYS_REQUIRED(glVertex4d), GLFUNC_ALWAYS_REQUIRED(glVertex4f),
-    GLFUNC_ALWAYS_REQUIRED(glVertex4i), GLFUNC_ALWAYS_REQUIRED(glVertex4s),
-    GLFUNC_ALWAYS_REQUIRED(glVertex2dv), GLFUNC_ALWAYS_REQUIRED(glVertex2fv),
-    GLFUNC_ALWAYS_REQUIRED(glVertex2iv), GLFUNC_ALWAYS_REQUIRED(glVertex2sv),
-    GLFUNC_ALWAYS_REQUIRED(glVertex3dv), GLFUNC_ALWAYS_REQUIRED(glVertex3fv),
-    GLFUNC_ALWAYS_REQUIRED(glVertex3iv), GLFUNC_ALWAYS_REQUIRED(glVertex3sv),
-    GLFUNC_ALWAYS_REQUIRED(glVertex4dv), GLFUNC_ALWAYS_REQUIRED(glVertex4fv),
-    GLFUNC_ALWAYS_REQUIRED(glVertex4iv), GLFUNC_ALWAYS_REQUIRED(glVertex4sv),
-    GLFUNC_ALWAYS_REQUIRED(glNormal3b), GLFUNC_ALWAYS_REQUIRED(glNormal3d),
-    GLFUNC_ALWAYS_REQUIRED(glNormal3f), GLFUNC_ALWAYS_REQUIRED(glNormal3i),
-    GLFUNC_ALWAYS_REQUIRED(glNormal3s), GLFUNC_ALWAYS_REQUIRED(glNormal3bv),
-    GLFUNC_ALWAYS_REQUIRED(glNormal3dv), GLFUNC_ALWAYS_REQUIRED(glNormal3fv),
-    GLFUNC_ALWAYS_REQUIRED(glNormal3iv), GLFUNC_ALWAYS_REQUIRED(glNormal3sv),
-    GLFUNC_ALWAYS_REQUIRED(glIndexd), GLFUNC_ALWAYS_REQUIRED(glIndexf),
-    GLFUNC_ALWAYS_REQUIRED(glIndexi), GLFUNC_ALWAYS_REQUIRED(glIndexs),
-    GLFUNC_ALWAYS_REQUIRED(glIndexub), GLFUNC_ALWAYS_REQUIRED(glIndexdv),
-    GLFUNC_ALWAYS_REQUIRED(glIndexfv), GLFUNC_ALWAYS_REQUIRED(glIndexiv),
-    GLFUNC_ALWAYS_REQUIRED(glIndexsv), GLFUNC_ALWAYS_REQUIRED(glIndexubv),
-    GLFUNC_ALWAYS_REQUIRED(glColor3b), GLFUNC_ALWAYS_REQUIRED(glColor3d),
-    GLFUNC_ALWAYS_REQUIRED(glColor3f), GLFUNC_ALWAYS_REQUIRED(glColor3i),
-    GLFUNC_ALWAYS_REQUIRED(glColor3s), GLFUNC_ALWAYS_REQUIRED(glColor3ub),
-    GLFUNC_ALWAYS_REQUIRED(glColor3ui), GLFUNC_ALWAYS_REQUIRED(glColor3us),
-    GLFUNC_ALWAYS_REQUIRED(glColor4b), GLFUNC_ALWAYS_REQUIRED(glColor4d),
-    GLFUNC_ALWAYS_REQUIRED(glColor4f), GLFUNC_ALWAYS_REQUIRED(glColor4i),
-    GLFUNC_ALWAYS_REQUIRED(glColor4s), GLFUNC_ALWAYS_REQUIRED(glColor4ub),
-    GLFUNC_ALWAYS_REQUIRED(glColor4ui), GLFUNC_ALWAYS_REQUIRED(glColor4us),
-    GLFUNC_ALWAYS_REQUIRED(glColor3bv), GLFUNC_ALWAYS_REQUIRED(glColor3dv),
-    GLFUNC_ALWAYS_REQUIRED(glColor3fv), GLFUNC_ALWAYS_REQUIRED(glColor3iv),
-    GLFUNC_ALWAYS_REQUIRED(glColor3sv), GLFUNC_ALWAYS_REQUIRED(glColor3ubv),
-    GLFUNC_ALWAYS_REQUIRED(glColor3uiv), GLFUNC_ALWAYS_REQUIRED(glColor3usv),
-    GLFUNC_ALWAYS_REQUIRED(glColor4bv), GLFUNC_ALWAYS_REQUIRED(glColor4dv),
-    GLFUNC_ALWAYS_REQUIRED(glColor4fv), GLFUNC_ALWAYS_REQUIRED(glColor4iv),
-    GLFUNC_ALWAYS_REQUIRED(glColor4sv), GLFUNC_ALWAYS_REQUIRED(glColor4ubv),
-    GLFUNC_ALWAYS_REQUIRED(glColor4uiv), GLFUNC_ALWAYS_REQUIRED(glColor4usv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord1d), GLFUNC_ALWAYS_REQUIRED(glTexCoord1f),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord1i), GLFUNC_ALWAYS_REQUIRED(glTexCoord1s),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord2d), GLFUNC_ALWAYS_REQUIRED(glTexCoord2f),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord2i), GLFUNC_ALWAYS_REQUIRED(glTexCoord2s),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord3d), GLFUNC_ALWAYS_REQUIRED(glTexCoord3f),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord3i), GLFUNC_ALWAYS_REQUIRED(glTexCoord3s),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord4d), GLFUNC_ALWAYS_REQUIRED(glTexCoord4f),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord4i), GLFUNC_ALWAYS_REQUIRED(glTexCoord4s),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord1dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord1fv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord1iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord1sv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord2dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord2fv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord2iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord2sv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord3dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord3fv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord3iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord3sv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord4dv), GLFUNC_ALWAYS_REQUIRED(glTexCoord4fv),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoord4iv), GLFUNC_ALWAYS_REQUIRED(glTexCoord4sv),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos2d), GLFUNC_ALWAYS_REQUIRED(glRasterPos2f),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos2i), GLFUNC_ALWAYS_REQUIRED(glRasterPos2s),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos3d), GLFUNC_ALWAYS_REQUIRED(glRasterPos3f),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos3i), GLFUNC_ALWAYS_REQUIRED(glRasterPos3s),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos4d), GLFUNC_ALWAYS_REQUIRED(glRasterPos4f),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos4i), GLFUNC_ALWAYS_REQUIRED(glRasterPos4s),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos2dv), GLFUNC_ALWAYS_REQUIRED(glRasterPos2fv),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos2iv), GLFUNC_ALWAYS_REQUIRED(glRasterPos2sv),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos3dv), GLFUNC_ALWAYS_REQUIRED(glRasterPos3fv),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos3iv), GLFUNC_ALWAYS_REQUIRED(glRasterPos3sv),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos4dv), GLFUNC_ALWAYS_REQUIRED(glRasterPos4fv),
-    GLFUNC_ALWAYS_REQUIRED(glRasterPos4iv), GLFUNC_ALWAYS_REQUIRED(glRasterPos4sv),
-    GLFUNC_ALWAYS_REQUIRED(glRectd), GLFUNC_ALWAYS_REQUIRED(glRectf),
-    GLFUNC_ALWAYS_REQUIRED(glRecti), GLFUNC_ALWAYS_REQUIRED(glRects),
-    GLFUNC_ALWAYS_REQUIRED(glRectdv), GLFUNC_ALWAYS_REQUIRED(glRectfv),
-    GLFUNC_ALWAYS_REQUIRED(glRectiv), GLFUNC_ALWAYS_REQUIRED(glRectsv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexPointer), GLFUNC_ALWAYS_REQUIRED(glNormalPointer),
-    GLFUNC_ALWAYS_REQUIRED(glColorPointer), GLFUNC_ALWAYS_REQUIRED(glIndexPointer),
-    GLFUNC_ALWAYS_REQUIRED(glTexCoordPointer), GLFUNC_ALWAYS_REQUIRED(glEdgeFlagPointer),
-    GLFUNC_ALWAYS_REQUIRED(glArrayElement), GLFUNC_ALWAYS_REQUIRED(glInterleavedArrays),
-    GLFUNC_ALWAYS_REQUIRED(glShadeModel), GLFUNC_ALWAYS_REQUIRED(glLightf),
-    GLFUNC_ALWAYS_REQUIRED(glLighti), GLFUNC_ALWAYS_REQUIRED(glLightfv),
-    GLFUNC_ALWAYS_REQUIRED(glLightiv), GLFUNC_ALWAYS_REQUIRED(glGetLightfv),
-    GLFUNC_ALWAYS_REQUIRED(glGetLightiv), GLFUNC_ALWAYS_REQUIRED(glLightModelf),
-    GLFUNC_ALWAYS_REQUIRED(glLightModeli), GLFUNC_ALWAYS_REQUIRED(glLightModelfv),
-    GLFUNC_ALWAYS_REQUIRED(glLightModeliv), GLFUNC_ALWAYS_REQUIRED(glMaterialf),
-    GLFUNC_ALWAYS_REQUIRED(glMateriali), GLFUNC_ALWAYS_REQUIRED(glMaterialfv),
-    GLFUNC_ALWAYS_REQUIRED(glMaterialiv), GLFUNC_ALWAYS_REQUIRED(glGetMaterialfv),
-    GLFUNC_ALWAYS_REQUIRED(glGetMaterialiv), GLFUNC_ALWAYS_REQUIRED(glColorMaterial),
-    GLFUNC_ALWAYS_REQUIRED(glPixelZoom), GLFUNC_ALWAYS_REQUIRED(glPixelStoref),
-    GLFUNC_ALWAYS_REQUIRED(glPixelTransferf), GLFUNC_ALWAYS_REQUIRED(glPixelTransferi),
-    GLFUNC_ALWAYS_REQUIRED(glPixelMapfv), GLFUNC_ALWAYS_REQUIRED(glPixelMapuiv),
-    GLFUNC_ALWAYS_REQUIRED(glPixelMapusv), GLFUNC_ALWAYS_REQUIRED(glGetPixelMapfv),
-    GLFUNC_ALWAYS_REQUIRED(glGetPixelMapuiv), GLFUNC_ALWAYS_REQUIRED(glGetPixelMapusv),
-    GLFUNC_ALWAYS_REQUIRED(glBitmap), GLFUNC_ALWAYS_REQUIRED(glDrawPixels),
-    GLFUNC_ALWAYS_REQUIRED(glCopyPixels), GLFUNC_ALWAYS_REQUIRED(glTexGend),
-    GLFUNC_ALWAYS_REQUIRED(glTexGenf), GLFUNC_ALWAYS_REQUIRED(glTexGeni),
-    GLFUNC_ALWAYS_REQUIRED(glTexGendv), GLFUNC_ALWAYS_REQUIRED(glTexGenfv),
-    GLFUNC_ALWAYS_REQUIRED(glTexGeniv), GLFUNC_ALWAYS_REQUIRED(glGetTexGendv),
-    GLFUNC_ALWAYS_REQUIRED(glGetTexGenfv), GLFUNC_ALWAYS_REQUIRED(glGetTexGeniv),
-    GLFUNC_ALWAYS_REQUIRED(glTexEnvf), GLFUNC_ALWAYS_REQUIRED(glTexEnvi),
-    GLFUNC_ALWAYS_REQUIRED(glTexEnvfv), GLFUNC_ALWAYS_REQUIRED(glTexEnviv),
-    GLFUNC_ALWAYS_REQUIRED(glGetTexEnvfv), GLFUNC_ALWAYS_REQUIRED(glGetTexEnviv),
+    GLFUNC_ALWAYS_REQUIRED(glClearIndex),
+    GLFUNC_ALWAYS_REQUIRED(glIndexMask),
+    GLFUNC_ALWAYS_REQUIRED(glAlphaFunc),
+    GLFUNC_ALWAYS_REQUIRED(glLogicOp),
+    GLFUNC_ALWAYS_REQUIRED(glPointSize),
+    GLFUNC_ALWAYS_REQUIRED(glLineStipple),
+    GLFUNC_ALWAYS_REQUIRED(glPolygonMode),
+    GLFUNC_ALWAYS_REQUIRED(glPolygonStipple),
+    GLFUNC_ALWAYS_REQUIRED(glGetPolygonStipple),
+    GLFUNC_ALWAYS_REQUIRED(glEdgeFlag),
+    GLFUNC_ALWAYS_REQUIRED(glEdgeFlagv),
+    GLFUNC_ALWAYS_REQUIRED(glClipPlane),
+    GLFUNC_ALWAYS_REQUIRED(glGetClipPlane),
+    GLFUNC_ALWAYS_REQUIRED(glDrawBuffer),
+    GLFUNC_ALWAYS_REQUIRED(glEnableClientState),
+    GLFUNC_ALWAYS_REQUIRED(glDisableClientState),
+    GLFUNC_ALWAYS_REQUIRED(glGetDoublev),
+    GLFUNC_ALWAYS_REQUIRED(glPushAttrib),
+    GLFUNC_ALWAYS_REQUIRED(glPopAttrib),
+    GLFUNC_ALWAYS_REQUIRED(glPushClientAttrib),
+    GLFUNC_ALWAYS_REQUIRED(glPopClientAttrib),
+    GLFUNC_ALWAYS_REQUIRED(glRenderMode),
+    GLFUNC_ALWAYS_REQUIRED(glClearDepth),
+    GLFUNC_ALWAYS_REQUIRED(glDepthRange),
+    GLFUNC_ALWAYS_REQUIRED(glClearAccum),
+    GLFUNC_ALWAYS_REQUIRED(glAccum),
+    GLFUNC_ALWAYS_REQUIRED(glMatrixMode),
+    GLFUNC_ALWAYS_REQUIRED(glOrtho),
+    GLFUNC_ALWAYS_REQUIRED(glFrustum),
+    GLFUNC_ALWAYS_REQUIRED(glPushMatrix),
+    GLFUNC_ALWAYS_REQUIRED(glPopMatrix),
+    GLFUNC_ALWAYS_REQUIRED(glLoadIdentity),
+    GLFUNC_ALWAYS_REQUIRED(glLoadMatrixd),
+    GLFUNC_ALWAYS_REQUIRED(glLoadMatrixf),
+    GLFUNC_ALWAYS_REQUIRED(glMultMatrixd),
+    GLFUNC_ALWAYS_REQUIRED(glMultMatrixf),
+    GLFUNC_ALWAYS_REQUIRED(glRotated),
+    GLFUNC_ALWAYS_REQUIRED(glRotatef),
+    GLFUNC_ALWAYS_REQUIRED(glScaled),
+    GLFUNC_ALWAYS_REQUIRED(glScalef),
+    GLFUNC_ALWAYS_REQUIRED(glTranslated),
+    GLFUNC_ALWAYS_REQUIRED(glTranslatef),
+    GLFUNC_ALWAYS_REQUIRED(glIsList),
+    GLFUNC_ALWAYS_REQUIRED(glDeleteLists),
+    GLFUNC_ALWAYS_REQUIRED(glGenLists),
+    GLFUNC_ALWAYS_REQUIRED(glNewList),
+    GLFUNC_ALWAYS_REQUIRED(glEndList),
+    GLFUNC_ALWAYS_REQUIRED(glCallList),
+    GLFUNC_ALWAYS_REQUIRED(glCallLists),
+    GLFUNC_ALWAYS_REQUIRED(glListBase),
+    GLFUNC_ALWAYS_REQUIRED(glBegin),
+    GLFUNC_ALWAYS_REQUIRED(glEnd),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2d),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2f),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2i),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2s),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3d),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3f),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3i),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3s),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4d),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4f),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4i),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4s),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2fv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2iv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex2sv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3fv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3iv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex3sv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4fv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4iv),
+    GLFUNC_ALWAYS_REQUIRED(glVertex4sv),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3b),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3d),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3f),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3i),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3s),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3bv),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3dv),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3fv),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3iv),
+    GLFUNC_ALWAYS_REQUIRED(glNormal3sv),
+    GLFUNC_ALWAYS_REQUIRED(glIndexd),
+    GLFUNC_ALWAYS_REQUIRED(glIndexf),
+    GLFUNC_ALWAYS_REQUIRED(glIndexi),
+    GLFUNC_ALWAYS_REQUIRED(glIndexs),
+    GLFUNC_ALWAYS_REQUIRED(glIndexub),
+    GLFUNC_ALWAYS_REQUIRED(glIndexdv),
+    GLFUNC_ALWAYS_REQUIRED(glIndexfv),
+    GLFUNC_ALWAYS_REQUIRED(glIndexiv),
+    GLFUNC_ALWAYS_REQUIRED(glIndexsv),
+    GLFUNC_ALWAYS_REQUIRED(glIndexubv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3b),
+    GLFUNC_ALWAYS_REQUIRED(glColor3d),
+    GLFUNC_ALWAYS_REQUIRED(glColor3f),
+    GLFUNC_ALWAYS_REQUIRED(glColor3i),
+    GLFUNC_ALWAYS_REQUIRED(glColor3s),
+    GLFUNC_ALWAYS_REQUIRED(glColor3ub),
+    GLFUNC_ALWAYS_REQUIRED(glColor3ui),
+    GLFUNC_ALWAYS_REQUIRED(glColor3us),
+    GLFUNC_ALWAYS_REQUIRED(glColor4b),
+    GLFUNC_ALWAYS_REQUIRED(glColor4d),
+    GLFUNC_ALWAYS_REQUIRED(glColor4f),
+    GLFUNC_ALWAYS_REQUIRED(glColor4i),
+    GLFUNC_ALWAYS_REQUIRED(glColor4s),
+    GLFUNC_ALWAYS_REQUIRED(glColor4ub),
+    GLFUNC_ALWAYS_REQUIRED(glColor4ui),
+    GLFUNC_ALWAYS_REQUIRED(glColor4us),
+    GLFUNC_ALWAYS_REQUIRED(glColor3bv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3dv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3fv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3iv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3sv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3ubv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3uiv),
+    GLFUNC_ALWAYS_REQUIRED(glColor3usv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4bv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4dv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4fv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4iv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4sv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4ubv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4uiv),
+    GLFUNC_ALWAYS_REQUIRED(glColor4usv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1d),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1f),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1i),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1s),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2d),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2f),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2i),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2s),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3d),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3f),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3i),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3s),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4d),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4f),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4i),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4s),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1dv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1fv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1iv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord1sv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2dv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2fv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2iv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord2sv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3dv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3fv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3iv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord3sv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4dv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4fv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4iv),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoord4sv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2d),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2f),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2i),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2s),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3d),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3f),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3i),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3s),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4d),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4f),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4i),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4s),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2dv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2fv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2iv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos2sv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3dv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3fv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3iv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos3sv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4dv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4fv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4iv),
+    GLFUNC_ALWAYS_REQUIRED(glRasterPos4sv),
+    GLFUNC_ALWAYS_REQUIRED(glRectd),
+    GLFUNC_ALWAYS_REQUIRED(glRectf),
+    GLFUNC_ALWAYS_REQUIRED(glRecti),
+    GLFUNC_ALWAYS_REQUIRED(glRects),
+    GLFUNC_ALWAYS_REQUIRED(glRectdv),
+    GLFUNC_ALWAYS_REQUIRED(glRectfv),
+    GLFUNC_ALWAYS_REQUIRED(glRectiv),
+    GLFUNC_ALWAYS_REQUIRED(glRectsv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexPointer),
+    GLFUNC_ALWAYS_REQUIRED(glNormalPointer),
+    GLFUNC_ALWAYS_REQUIRED(glColorPointer),
+    GLFUNC_ALWAYS_REQUIRED(glIndexPointer),
+    GLFUNC_ALWAYS_REQUIRED(glTexCoordPointer),
+    GLFUNC_ALWAYS_REQUIRED(glEdgeFlagPointer),
+    GLFUNC_ALWAYS_REQUIRED(glArrayElement),
+    GLFUNC_ALWAYS_REQUIRED(glInterleavedArrays),
+    GLFUNC_ALWAYS_REQUIRED(glShadeModel),
+    GLFUNC_ALWAYS_REQUIRED(glLightf),
+    GLFUNC_ALWAYS_REQUIRED(glLighti),
+    GLFUNC_ALWAYS_REQUIRED(glLightfv),
+    GLFUNC_ALWAYS_REQUIRED(glLightiv),
+    GLFUNC_ALWAYS_REQUIRED(glGetLightfv),
+    GLFUNC_ALWAYS_REQUIRED(glGetLightiv),
+    GLFUNC_ALWAYS_REQUIRED(glLightModelf),
+    GLFUNC_ALWAYS_REQUIRED(glLightModeli),
+    GLFUNC_ALWAYS_REQUIRED(glLightModelfv),
+    GLFUNC_ALWAYS_REQUIRED(glLightModeliv),
+    GLFUNC_ALWAYS_REQUIRED(glMaterialf),
+    GLFUNC_ALWAYS_REQUIRED(glMateriali),
+    GLFUNC_ALWAYS_REQUIRED(glMaterialfv),
+    GLFUNC_ALWAYS_REQUIRED(glMaterialiv),
+    GLFUNC_ALWAYS_REQUIRED(glGetMaterialfv),
+    GLFUNC_ALWAYS_REQUIRED(glGetMaterialiv),
+    GLFUNC_ALWAYS_REQUIRED(glColorMaterial),
+    GLFUNC_ALWAYS_REQUIRED(glPixelZoom),
+    GLFUNC_ALWAYS_REQUIRED(glPixelStoref),
+    GLFUNC_ALWAYS_REQUIRED(glPixelTransferf),
+    GLFUNC_ALWAYS_REQUIRED(glPixelTransferi),
+    GLFUNC_ALWAYS_REQUIRED(glPixelMapfv),
+    GLFUNC_ALWAYS_REQUIRED(glPixelMapuiv),
+    GLFUNC_ALWAYS_REQUIRED(glPixelMapusv),
+    GLFUNC_ALWAYS_REQUIRED(glGetPixelMapfv),
+    GLFUNC_ALWAYS_REQUIRED(glGetPixelMapuiv),
+    GLFUNC_ALWAYS_REQUIRED(glGetPixelMapusv),
+    GLFUNC_ALWAYS_REQUIRED(glBitmap),
+    GLFUNC_ALWAYS_REQUIRED(glDrawPixels),
+    GLFUNC_ALWAYS_REQUIRED(glCopyPixels),
+    GLFUNC_ALWAYS_REQUIRED(glTexGend),
+    GLFUNC_ALWAYS_REQUIRED(glTexGenf),
+    GLFUNC_ALWAYS_REQUIRED(glTexGeni),
+    GLFUNC_ALWAYS_REQUIRED(glTexGendv),
+    GLFUNC_ALWAYS_REQUIRED(glTexGenfv),
+    GLFUNC_ALWAYS_REQUIRED(glTexGeniv),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexGendv),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexGenfv),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexGeniv),
+    GLFUNC_ALWAYS_REQUIRED(glTexEnvf),
+    GLFUNC_ALWAYS_REQUIRED(glTexEnvi),
+    GLFUNC_ALWAYS_REQUIRED(glTexEnvfv),
+    GLFUNC_ALWAYS_REQUIRED(glTexEnviv),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexEnvfv),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexEnviv),
     GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameterfv),
-    GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameteriv), GLFUNC_ALWAYS_REQUIRED(glTexImage1D),
-    GLFUNC_ALWAYS_REQUIRED(glGetTexImage), GLFUNC_ALWAYS_REQUIRED(glPrioritizeTextures),
-    GLFUNC_ALWAYS_REQUIRED(glAreTexturesResident), GLFUNC_ALWAYS_REQUIRED(glTexSubImage1D),
-    GLFUNC_ALWAYS_REQUIRED(glCopyTexImage1D), GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage1D),
-    GLFUNC_ALWAYS_REQUIRED(glMap1d), GLFUNC_ALWAYS_REQUIRED(glMap1f),
-    GLFUNC_ALWAYS_REQUIRED(glMap2d), GLFUNC_ALWAYS_REQUIRED(glMap2f),
-    GLFUNC_ALWAYS_REQUIRED(glGetMapdv), GLFUNC_ALWAYS_REQUIRED(glGetMapfv),
-    GLFUNC_ALWAYS_REQUIRED(glGetMapiv), GLFUNC_ALWAYS_REQUIRED(glEvalCoord1d),
-    GLFUNC_ALWAYS_REQUIRED(glEvalCoord1f), GLFUNC_ALWAYS_REQUIRED(glEvalCoord1dv),
-    GLFUNC_ALWAYS_REQUIRED(glEvalCoord1fv), GLFUNC_ALWAYS_REQUIRED(glEvalCoord2d),
-    GLFUNC_ALWAYS_REQUIRED(glEvalCoord2f), GLFUNC_ALWAYS_REQUIRED(glEvalCoord2dv),
-    GLFUNC_ALWAYS_REQUIRED(glEvalCoord2fv), GLFUNC_ALWAYS_REQUIRED(glMapGrid1d),
-    GLFUNC_ALWAYS_REQUIRED(glMapGrid1f), GLFUNC_ALWAYS_REQUIRED(glMapGrid2d),
-    GLFUNC_ALWAYS_REQUIRED(glMapGrid2f), GLFUNC_ALWAYS_REQUIRED(glEvalPoint1),
-    GLFUNC_ALWAYS_REQUIRED(glEvalPoint2), GLFUNC_ALWAYS_REQUIRED(glEvalMesh1),
-    GLFUNC_ALWAYS_REQUIRED(glEvalMesh2), GLFUNC_ALWAYS_REQUIRED(glFogf),
-    GLFUNC_ALWAYS_REQUIRED(glFogi), GLFUNC_ALWAYS_REQUIRED(glFogfv),
-    GLFUNC_ALWAYS_REQUIRED(glFogiv), GLFUNC_ALWAYS_REQUIRED(glFeedbackBuffer),
-    GLFUNC_ALWAYS_REQUIRED(glPassThrough), GLFUNC_ALWAYS_REQUIRED(glSelectBuffer),
-    GLFUNC_ALWAYS_REQUIRED(glInitNames), GLFUNC_ALWAYS_REQUIRED(glLoadName),
-    GLFUNC_ALWAYS_REQUIRED(glPushName), GLFUNC_ALWAYS_REQUIRED(glPopName),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glTexImage2D), GL_ES_FUNC_ALWAYS_REQUIRED(glClearColor),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glClear), GL_ES_FUNC_ALWAYS_REQUIRED(glColorMask),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glBlendFunc), GL_ES_FUNC_ALWAYS_REQUIRED(glCullFace),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glFrontFace), GL_ES_FUNC_ALWAYS_REQUIRED(glLineWidth),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glPolygonOffset), GL_ES_FUNC_ALWAYS_REQUIRED(glScissor),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glEnable), GL_ES_FUNC_ALWAYS_REQUIRED(glDisable),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glIsEnabled), GL_ES_FUNC_ALWAYS_REQUIRED(glGetBooleanv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetFloatv), GL_ES_FUNC_ALWAYS_REQUIRED(glFinish),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glFlush), GL_ES_FUNC_ALWAYS_REQUIRED(glHint),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glDepthFunc), GL_ES_FUNC_ALWAYS_REQUIRED(glDepthMask),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glViewport), GL_ES_FUNC_ALWAYS_REQUIRED(glDrawArrays),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glDrawElements), GL_ES_FUNC_ALWAYS_REQUIRED(glPixelStorei),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glReadPixels), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFunc),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilMask), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOp),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glClearStencil), GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterf),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteri), GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterfv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteriv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameterfv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameteriv), GL_ES_FUNC_ALWAYS_REQUIRED(glGenTextures),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteTextures), GL_ES_FUNC_ALWAYS_REQUIRED(glBindTexture),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glIsTexture), GL_ES_FUNC_ALWAYS_REQUIRED(glTexSubImage2D),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexImage2D), GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexSubImage2D),
-    GL_ES3_FUNC_ALWAYS_REQUIRED(glReadBuffer), GL_ES32_FUNC_ALWAYS_REQUIRED(glGetPointerv),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexLevelParameteriv),
+    GLFUNC_ALWAYS_REQUIRED(glTexImage1D),
+    GLFUNC_ALWAYS_REQUIRED(glGetTexImage),
+    GLFUNC_ALWAYS_REQUIRED(glPrioritizeTextures),
+    GLFUNC_ALWAYS_REQUIRED(glAreTexturesResident),
+    GLFUNC_ALWAYS_REQUIRED(glTexSubImage1D),
+    GLFUNC_ALWAYS_REQUIRED(glCopyTexImage1D),
+    GLFUNC_ALWAYS_REQUIRED(glCopyTexSubImage1D),
+    GLFUNC_ALWAYS_REQUIRED(glMap1d),
+    GLFUNC_ALWAYS_REQUIRED(glMap1f),
+    GLFUNC_ALWAYS_REQUIRED(glMap2d),
+    GLFUNC_ALWAYS_REQUIRED(glMap2f),
+    GLFUNC_ALWAYS_REQUIRED(glGetMapdv),
+    GLFUNC_ALWAYS_REQUIRED(glGetMapfv),
+    GLFUNC_ALWAYS_REQUIRED(glGetMapiv),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord1d),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord1f),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord1dv),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord1fv),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord2d),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord2f),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord2dv),
+    GLFUNC_ALWAYS_REQUIRED(glEvalCoord2fv),
+    GLFUNC_ALWAYS_REQUIRED(glMapGrid1d),
+    GLFUNC_ALWAYS_REQUIRED(glMapGrid1f),
+    GLFUNC_ALWAYS_REQUIRED(glMapGrid2d),
+    GLFUNC_ALWAYS_REQUIRED(glMapGrid2f),
+    GLFUNC_ALWAYS_REQUIRED(glEvalPoint1),
+    GLFUNC_ALWAYS_REQUIRED(glEvalPoint2),
+    GLFUNC_ALWAYS_REQUIRED(glEvalMesh1),
+    GLFUNC_ALWAYS_REQUIRED(glEvalMesh2),
+    GLFUNC_ALWAYS_REQUIRED(glFogf),
+    GLFUNC_ALWAYS_REQUIRED(glFogi),
+    GLFUNC_ALWAYS_REQUIRED(glFogfv),
+    GLFUNC_ALWAYS_REQUIRED(glFogiv),
+    GLFUNC_ALWAYS_REQUIRED(glFeedbackBuffer),
+    GLFUNC_ALWAYS_REQUIRED(glPassThrough),
+    GLFUNC_ALWAYS_REQUIRED(glSelectBuffer),
+    GLFUNC_ALWAYS_REQUIRED(glInitNames),
+    GLFUNC_ALWAYS_REQUIRED(glLoadName),
+    GLFUNC_ALWAYS_REQUIRED(glPushName),
+    GLFUNC_ALWAYS_REQUIRED(glPopName),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glTexImage2D),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glClearColor),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glClear),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glColorMask),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBlendFunc),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCullFace),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glFrontFace),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glLineWidth),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glPolygonOffset),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glScissor),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glEnable),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDisable),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glIsEnabled),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetBooleanv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetFloatv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glFinish),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glFlush),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glHint),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDepthFunc),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDepthMask),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glViewport),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDrawArrays),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDrawElements),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glPixelStorei),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glReadPixels),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFunc),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilMask),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOp),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glClearStencil),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterf),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteri),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameterfv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glTexParameteriv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameterfv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetTexParameteriv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGenTextures),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteTextures),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBindTexture),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glIsTexture),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glTexSubImage2D),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexImage2D),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCopyTexSubImage2D),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glReadBuffer),
+    GL_ES32_FUNC_ALWAYS_REQUIRED(glGetPointerv),
 
     // gl_1_2
     GL_ES3_FUNC_ALWAYS_REQUIRED(glCopyTexSubImage3D),
-    GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawRangeElements), GL_ES3_FUNC_ALWAYS_REQUIRED(glTexImage3D),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawRangeElements),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glTexImage3D),
     GL_ES3_FUNC_ALWAYS_REQUIRED(glTexSubImage3D),
 
     // gl_1_3
-    GLFUNC_ALWAYS_REQUIRED(glClientActiveTexture), GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage1D),
+    GLFUNC_ALWAYS_REQUIRED(glClientActiveTexture),
+    GLFUNC_ALWAYS_REQUIRED(glCompressedTexImage1D),
     GLFUNC_ALWAYS_REQUIRED(glCompressedTexSubImage1D),
-    GLFUNC_ALWAYS_REQUIRED(glGetCompressedTexImage), GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixd),
-    GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixf), GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixd),
-    GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixf), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1d),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1f),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1i),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1s),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1sv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2d),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2f),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2i),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2s),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2sv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3d),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3f),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3i),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3s),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3sv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4d),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4dv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4f),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4fv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4i),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4iv), GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4s),
-    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4sv), GL_ES_FUNC_ALWAYS_REQUIRED(glSampleCoverage),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glActiveTexture), GL_ES_FUNC_ALWAYS_REQUIRED(glCompressedTexImage2D),
+    GLFUNC_ALWAYS_REQUIRED(glGetCompressedTexImage),
+    GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixd),
+    GLFUNC_ALWAYS_REQUIRED(glLoadTransposeMatrixf),
+    GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixd),
+    GLFUNC_ALWAYS_REQUIRED(glMultTransposeMatrixf),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1d),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1dv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1f),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1fv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1i),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1iv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1s),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord1sv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2d),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2dv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2f),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2fv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2i),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2iv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2s),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord2sv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3d),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3dv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3f),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3fv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3i),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3iv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3s),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord3sv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4d),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4dv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4f),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4fv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4i),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4iv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4s),
+    GLFUNC_ALWAYS_REQUIRED(glMultiTexCoord4sv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glSampleCoverage),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glActiveTexture),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCompressedTexImage2D),
     GL_ES_FUNC_ALWAYS_REQUIRED(glCompressedTexSubImage2D),
     GL_ES3_FUNC_ALWAYS_REQUIRED(glCompressedTexImage3D),
     GL_ES3_FUNC_ALWAYS_REQUIRED(glCompressedTexSubImage3D),
 
     // gl_1_4
-    GLFUNC_ALWAYS_REQUIRED(glFogCoordPointer), GLFUNC_ALWAYS_REQUIRED(glFogCoordd),
-    GLFUNC_ALWAYS_REQUIRED(glFogCoorddv), GLFUNC_ALWAYS_REQUIRED(glFogCoordf),
-    GLFUNC_ALWAYS_REQUIRED(glFogCoordfv), GLFUNC_ALWAYS_REQUIRED(glMultiDrawArrays),
-    GLFUNC_ALWAYS_REQUIRED(glMultiDrawElements), GLFUNC_ALWAYS_REQUIRED(glPointParameterf),
-    GLFUNC_ALWAYS_REQUIRED(glPointParameterfv), GLFUNC_ALWAYS_REQUIRED(glPointParameteri),
-    GLFUNC_ALWAYS_REQUIRED(glPointParameteriv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3b),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3bv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3d),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3dv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3f),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3fv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3i),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3iv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3s),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3sv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ub),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ubv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ui),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3uiv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3us),
-    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3usv), GLFUNC_ALWAYS_REQUIRED(glSecondaryColorPointer),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos2d), GLFUNC_ALWAYS_REQUIRED(glWindowPos2dv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos2f), GLFUNC_ALWAYS_REQUIRED(glWindowPos2fv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos2i), GLFUNC_ALWAYS_REQUIRED(glWindowPos2iv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos2s), GLFUNC_ALWAYS_REQUIRED(glWindowPos2sv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos3d), GLFUNC_ALWAYS_REQUIRED(glWindowPos3dv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos3f), GLFUNC_ALWAYS_REQUIRED(glWindowPos3fv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos3i), GLFUNC_ALWAYS_REQUIRED(glWindowPos3iv),
-    GLFUNC_ALWAYS_REQUIRED(glWindowPos3s), GLFUNC_ALWAYS_REQUIRED(glWindowPos3sv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glBlendColor), GL_ES_FUNC_ALWAYS_REQUIRED(glBlendEquation),
+    GLFUNC_ALWAYS_REQUIRED(glFogCoordPointer),
+    GLFUNC_ALWAYS_REQUIRED(glFogCoordd),
+    GLFUNC_ALWAYS_REQUIRED(glFogCoorddv),
+    GLFUNC_ALWAYS_REQUIRED(glFogCoordf),
+    GLFUNC_ALWAYS_REQUIRED(glFogCoordfv),
+    GLFUNC_ALWAYS_REQUIRED(glMultiDrawArrays),
+    GLFUNC_ALWAYS_REQUIRED(glMultiDrawElements),
+    GLFUNC_ALWAYS_REQUIRED(glPointParameterf),
+    GLFUNC_ALWAYS_REQUIRED(glPointParameterfv),
+    GLFUNC_ALWAYS_REQUIRED(glPointParameteri),
+    GLFUNC_ALWAYS_REQUIRED(glPointParameteriv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3b),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3bv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3d),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3dv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3f),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3fv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3i),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3iv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3s),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3sv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ub),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ubv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3ui),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3uiv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3us),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColor3usv),
+    GLFUNC_ALWAYS_REQUIRED(glSecondaryColorPointer),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2d),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2dv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2f),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2fv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2i),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2iv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2s),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos2sv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3d),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3dv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3f),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3fv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3i),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3iv),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3s),
+    GLFUNC_ALWAYS_REQUIRED(glWindowPos3sv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBlendColor),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBlendEquation),
     GL_ES_FUNC_ALWAYS_REQUIRED(glBlendFuncSeparate),
 
     // gl_1_5
-    GLFUNC_ALWAYS_REQUIRED(glGetBufferSubData), GLFUNC_ALWAYS_REQUIRED(glGetQueryObjectiv),
-    GLFUNC_ALWAYS_REQUIRED(glMapBuffer), GL_ES_FUNC_ALWAYS_REQUIRED(glBindBuffer),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glBufferData), GL_ES_FUNC_ALWAYS_REQUIRED(glBufferSubData),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteBuffers), GL_ES_FUNC_ALWAYS_REQUIRED(glGenBuffers),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetBufferParameteriv), GL_ES_FUNC_ALWAYS_REQUIRED(glIsBuffer),
-    GL_ES3_FUNC_ALWAYS_REQUIRED(glBeginQuery), GL_ES3_FUNC_ALWAYS_REQUIRED(glDeleteQueries),
-    GL_ES3_FUNC_ALWAYS_REQUIRED(glEndQuery), GL_ES3_FUNC_ALWAYS_REQUIRED(glGenQueries),
-    GL_ES3_FUNC_ALWAYS_REQUIRED(glIsQuery), GL_ES3_FUNC_ALWAYS_REQUIRED(glGetQueryiv),
+    GLFUNC_ALWAYS_REQUIRED(glGetBufferSubData),
+    GLFUNC_ALWAYS_REQUIRED(glGetQueryObjectiv),
+    GLFUNC_ALWAYS_REQUIRED(glMapBuffer),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBindBuffer),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBufferData),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glBufferSubData),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteBuffers),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGenBuffers),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetBufferParameteriv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glIsBuffer),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glBeginQuery),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glDeleteQueries),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glEndQuery),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glGenQueries),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glIsQuery),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glGetQueryiv),
     GL_ES3_FUNC_ALWAYS_REQUIRED(glGetQueryObjectuiv),
-    GL_ES3_FUNC_ALWAYS_REQUIRED(glGetBufferPointerv), GL_ES3_FUNC_ALWAYS_REQUIRED(glUnmapBuffer),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glGetBufferPointerv),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glUnmapBuffer),
 
     // gl_2_0
-    GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribdv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1d),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1s),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1sv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2d),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2s),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2sv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3d),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3s),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3sv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nbv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Niv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nsv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nub), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nubv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nuiv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nusv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4bv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4d),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4dv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4iv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4s), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4sv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4ubv), GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4uiv),
-    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4usv), GL_ES_FUNC_ALWAYS_REQUIRED(glAttachShader),
+    GLFUNC_ALWAYS_REQUIRED(glGetVertexAttribdv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1d),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1s),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib1sv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2d),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2s),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib2sv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3d),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3s),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib3sv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nbv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Niv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nsv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nub),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nubv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nuiv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4Nusv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4bv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4d),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4dv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4iv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4s),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4sv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4ubv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4uiv),
+    GLFUNC_ALWAYS_REQUIRED(glVertexAttrib4usv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glAttachShader),
     GL_ES_FUNC_ALWAYS_REQUIRED(glBindAttribLocation),
     GL_ES_FUNC_ALWAYS_REQUIRED(glBlendEquationSeparate),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glCompileShader), GL_ES_FUNC_ALWAYS_REQUIRED(glCreateProgram),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glCreateShader), GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteProgram),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteShader), GL_ES_FUNC_ALWAYS_REQUIRED(glDetachShader),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCompileShader),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCreateProgram),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glCreateShader),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteProgram),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDeleteShader),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glDetachShader),
     GL_ES_FUNC_ALWAYS_REQUIRED(glDisableVertexAttribArray),
     GL_ES_FUNC_ALWAYS_REQUIRED(glEnableVertexAttribArray),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveAttrib), GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveUniform),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveAttrib),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetActiveUniform),
     GL_ES_FUNC_ALWAYS_REQUIRED(glGetAttachedShaders),
     GL_ES_FUNC_ALWAYS_REQUIRED(glGetAttribLocation),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramInfoLog), GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramiv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderInfoLog), GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderSource),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderiv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformLocation),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformfv), GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformiv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramInfoLog),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetProgramiv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderInfoLog),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderSource),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetShaderiv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformLocation),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformfv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetUniformiv),
     GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribPointerv),
     GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribfv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribiv), GL_ES_FUNC_ALWAYS_REQUIRED(glIsProgram),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glIsShader), GL_ES_FUNC_ALWAYS_REQUIRED(glLinkProgram),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glShaderSource), GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFuncSeparate),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glGetVertexAttribiv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glIsProgram),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glIsShader),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glLinkProgram),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glShaderSource),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilFuncSeparate),
     GL_ES_FUNC_ALWAYS_REQUIRED(glStencilMaskSeparate),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOpSeparate), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1f),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1i),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2f),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2i),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3f),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3i),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4f),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4i),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4iv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix2fv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix3fv), GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix4fv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glUseProgram), GL_ES_FUNC_ALWAYS_REQUIRED(glValidateProgram),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1fv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2fv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3fv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4f), GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4fv),
-    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttribPointer), GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawBuffers),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glStencilOpSeparate),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1i),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform1iv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2i),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform2iv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3i),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform3iv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4i),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniform4iv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix2fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix3fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUniformMatrix4fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glUseProgram),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glValidateProgram),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib1fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib2fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib3fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4f),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttrib4fv),
+    GL_ES_FUNC_ALWAYS_REQUIRED(glVertexAttribPointer),
+    GL_ES3_FUNC_ALWAYS_REQUIRED(glDrawBuffers),
 
     // gl_2_1
-    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x3fv), GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x4fv),
-    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x2fv), GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x4fv),
-    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x2fv), GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x3fv),
+    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x3fv),
+    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix2x4fv),
+    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x2fv),
+    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix3x4fv),
+    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x2fv),
+    GLFUNC_ALWAYS_REQUIRED(glUniformMatrix4x3fv),
 
     // gl_3_0
     GLFUNC_REQUIRES(glBeginConditionalRender, "VERSION_3_0"),
@@ -1412,8 +1677,10 @@ const GLFunc gl_function_array[] = {
     GLFUNC_REQUIRES(glGetInternalformativ, "VERSION_4_2"),
     GLFUNC_REQUIRES(glGetActiveAtomicCounterBufferiv, "VERSION_4_2"),
     GLFUNC_REQUIRES(glBindImageTexture, "VERSION_4_2"),
-    GLFUNC_REQUIRES(glMemoryBarrier, "VERSION_4_2"), GLFUNC_REQUIRES(glTexStorage1D, "VERSION_4_2"),
-    GLFUNC_REQUIRES(glTexStorage2D, "VERSION_4_2"), GLFUNC_REQUIRES(glTexStorage3D, "VERSION_4_2"),
+    GLFUNC_REQUIRES(glMemoryBarrier, "VERSION_4_2"),
+    GLFUNC_REQUIRES(glTexStorage1D, "VERSION_4_2"),
+    GLFUNC_REQUIRES(glTexStorage2D, "VERSION_4_2"),
+    GLFUNC_REQUIRES(glTexStorage3D, "VERSION_4_2"),
     GLFUNC_REQUIRES(glDrawTransformFeedbackInstanced, "VERSION_4_2"),
     GLFUNC_REQUIRES(glDrawTransformFeedbackStreamInstanced, "VERSION_4_2"),
 
@@ -1456,7 +1723,8 @@ const GLFunc gl_function_array[] = {
     GLFUNC_REQUIRES(glDebugMessageCallback, "VERSION_4_3"),
     GLFUNC_REQUIRES(glGetDebugMessageLog, "VERSION_4_3"),
     GLFUNC_REQUIRES(glPushDebugGroup, "VERSION_4_3"),
-    GLFUNC_REQUIRES(glPopDebugGroup, "VERSION_4_3"), GLFUNC_REQUIRES(glObjectLabel, "VERSION_4_3"),
+    GLFUNC_REQUIRES(glPopDebugGroup, "VERSION_4_3"),
+    GLFUNC_REQUIRES(glObjectLabel, "VERSION_4_3"),
     GLFUNC_REQUIRES(glGetObjectLabel, "VERSION_4_3"),
     GLFUNC_REQUIRES(glObjectPtrLabel, "VERSION_4_3"),
     GLFUNC_REQUIRES(glGetObjectPtrLabel, "VERSION_4_3"),
@@ -1467,7 +1735,8 @@ const GLFunc gl_function_array[] = {
     GLFUNC_REQUIRES(glClearTexSubImage, "VERSION_4_4"),
     GLFUNC_REQUIRES(glBindBuffersBase, "VERSION_4_4"),
     GLFUNC_REQUIRES(glBindBuffersRange, "VERSION_4_4"),
-    GLFUNC_REQUIRES(glBindTextures, "VERSION_4_4"), GLFUNC_REQUIRES(glBindSamplers, "VERSION_4_4"),
+    GLFUNC_REQUIRES(glBindTextures, "VERSION_4_4"),
+    GLFUNC_REQUIRES(glBindSamplers, "VERSION_4_4"),
     GLFUNC_REQUIRES(glBindImageTextures, "VERSION_4_4"),
     GLFUNC_REQUIRES(glBindVertexBuffers, "VERSION_4_4"),
 
@@ -1574,7 +1843,8 @@ const GLFunc gl_function_array[] = {
     GLFUNC_REQUIRES(glGetTextureSubImage, "VERSION_4_5"),
     GLFUNC_REQUIRES(glGetCompressedTextureSubImage, "VERSION_4_5"),
     GLFUNC_REQUIRES(glGetGraphicsResetStatus, "VERSION_4_5"),
-    GLFUNC_REQUIRES(glReadnPixels, "VERSION_4_5"), GLFUNC_REQUIRES(glTextureBarrier, "VERSION_4_5"),
+    GLFUNC_REQUIRES(glReadnPixels, "VERSION_4_5"),
+    GLFUNC_REQUIRES(glTextureBarrier, "VERSION_4_5"),
     // AMD's video driver is trash and doesn't expose these function pointers
     // Remove them for now until they learn how to implement the spec properly.
     // GLFUNC_REQUIRES(glGetnCompressedTexImage,                   "VERSION_4_5"),
@@ -2082,8 +2352,11 @@ static void InitExtensionList()
     {
       // Can't add NV_primitive_restart since function name changed
       std::string gl310exts[] = {
-          "GL_ARB_draw_instanced", "GL_ARB_copy_buffer", "GL_ARB_texture_buffer_object",
-          "GL_ARB_texture_rectangle", "GL_ARB_uniform_buffer_object",
+          "GL_ARB_draw_instanced",
+          "GL_ARB_copy_buffer",
+          "GL_ARB_texture_buffer_object",
+          "GL_ARB_texture_rectangle",
+          "GL_ARB_uniform_buffer_object",
           //"GL_NV_primitive_restart",
           "VERSION_3_1",
       };
@@ -2095,9 +2368,14 @@ static void InitExtensionList()
       // Quite a lot of these had their names changed when merged in to core
       // Disable the ones that have
       std::string gl300exts[] = {
-          "GL_ARB_map_buffer_range", "GL_ARB_color_buffer_float", "GL_ARB_texture_float",
-          "GL_ARB_half_float_pixel", "GL_ARB_framebuffer_object", "GL_ARB_texture_float",
-          "GL_ARB_vertex_array_object", "GL_ARB_depth_buffer_float",
+          "GL_ARB_map_buffer_range",
+          "GL_ARB_color_buffer_float",
+          "GL_ARB_texture_float",
+          "GL_ARB_half_float_pixel",
+          "GL_ARB_framebuffer_object",
+          "GL_ARB_texture_float",
+          "GL_ARB_vertex_array_object",
+          "GL_ARB_depth_buffer_float",
           //"GL_EXT_texture_integer",
           //"GL_EXT_gpu_shader4",
           //"GL_APPLE_flush_buffer_range",
diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index cb767bd2a4..e71b365928 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -53,7 +53,8 @@ void cInterfaceEGL::DetectMode()
   EGLint num_configs;
   bool supportsGL = false, supportsGLES2 = false, supportsGLES3 = false;
   std::array<int, 3> renderable_types{{
-      EGL_OPENGL_BIT, (1 << 6), /* EGL_OPENGL_ES3_BIT_KHR */
+      EGL_OPENGL_BIT,
+      (1 << 6), /* EGL_OPENGL_ES3_BIT_KHR */
       EGL_OPENGL_ES2_BIT,
   }};
 
@@ -237,7 +238,13 @@ bool cInterfaceEGL::Create(void* window_handle, bool stereo, bool core)
   if (supports_core_profile && core && s_opengl_mode == GLInterfaceMode::MODE_OPENGL)
   {
     std::array<std::pair<int, int>, 7> versions_to_try = {{
-        {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3},
+        {4, 5},
+        {4, 4},
+        {4, 3},
+        {4, 2},
+        {4, 1},
+        {4, 0},
+        {3, 3},
     }};
 
     for (const auto& version : versions_to_try)
diff --git a/Source/Core/Common/GL/GLInterface/EGL.h b/Source/Core/Common/GL/GLInterface/EGL.h
index 16a716e3c2..79c623c942 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.h
+++ b/Source/Core/Common/GL/GLInterface/EGL.h
@@ -35,6 +35,7 @@ protected:
     return (EGLNativeWindowType)EGL_DEFAULT_DISPLAY;
   }
   virtual void ShutdownPlatform() {}
+
 public:
   void Swap() override;
   void SwapInterval(int interval) override;
diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp
index 4d4647e838..7758168de5 100644
--- a/Source/Core/Common/GL/GLInterface/WGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/WGL.cpp
@@ -230,17 +230,26 @@ bool cInterfaceWGL::Create(void* window_handle, bool stereo, bool core)
       PFD_TYPE_RGBA,                  // Request An RGBA Format
       32,                             // Select Our Color Depth
       0,
-      0, 0, 0, 0, 0,   // Color Bits Ignored
-      0,               // 8bit Alpha Buffer
-      0,               // Shift Bit Ignored
-      0,               // No Accumulation Buffer
-      0, 0, 0, 0,      // Accumulation Bits Ignored
+      0,
+      0,
+      0,
+      0,
+      0,  // Color Bits Ignored
+      0,  // 8bit Alpha Buffer
+      0,  // Shift Bit Ignored
+      0,  // No Accumulation Buffer
+      0,
+      0,
+      0,
+      0,               // Accumulation Bits Ignored
       0,               // 0Bit Z-Buffer (Depth Buffer)
       0,               // 0bit Stencil Buffer
       0,               // No Auxiliary Buffer
       PFD_MAIN_PLANE,  // Main Drawing Layer
       0,               // Reserved
-      0, 0, 0          // Layer Masks Ignored
+      0,
+      0,
+      0  // Layer Masks Ignored
   };
 
   m_dc = GetDC(m_window_handle);
@@ -358,22 +367,22 @@ HGLRC cInterfaceWGL::CreateCoreContext(HDC dc, HGLRC share_context)
   for (const auto& version : try_versions)
   {
     // Construct list of attributes. Prefer a forward-compatible, core context.
-    std::array<int, 5 * 2> attribs = {
-        WGL_CONTEXT_PROFILE_MASK_ARB,
-        WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
+    std::array<int, 5 * 2> attribs = {WGL_CONTEXT_PROFILE_MASK_ARB,
+                                      WGL_CONTEXT_CORE_PROFILE_BIT_ARB,
 #ifdef _DEBUG
-        WGL_CONTEXT_FLAGS_ARB,
-        WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB | WGL_CONTEXT_DEBUG_BIT_ARB,
+                                      WGL_CONTEXT_FLAGS_ARB,
+                                      WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB |
+                                          WGL_CONTEXT_DEBUG_BIT_ARB,
 #else
-        WGL_CONTEXT_FLAGS_ARB,
-        WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
+                                      WGL_CONTEXT_FLAGS_ARB,
+                                      WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB,
 #endif
-        WGL_CONTEXT_MAJOR_VERSION_ARB,
-        version.first,
-        WGL_CONTEXT_MINOR_VERSION_ARB,
-        version.second,
-        0,
-        0};
+                                      WGL_CONTEXT_MAJOR_VERSION_ARB,
+                                      version.first,
+                                      WGL_CONTEXT_MINOR_VERSION_ARB,
+                                      version.second,
+                                      0,
+                                      0};
 
     // Attempt creating this context.
     HGLRC core_context = wglCreateContextAttribsARB(dc, nullptr, attribs.data());
diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
index 3fab6c86b6..e1681d4170 100644
--- a/Source/Core/Common/GekkoDisassembler.cpp
+++ b/Source/Core/Common/GekkoDisassembler.cpp
@@ -967,7 +967,7 @@ void GekkoDisassembler::mtfsb(u32 in, int n)
   }
 }
 
-// Paired instructions
+  // Paired instructions
 
 #define RA ((inst >> 16) & 0x1f)
 #define RB ((inst >> 11) & 0x1f)
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index faff71164f..697e700e7e 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -76,6 +76,7 @@ public:
     const std::string& GetName() const { return name; }
     const SectionMap& GetValues() const { return values; }
     bool HasLines() const { return !m_lines.empty(); }
+
   protected:
     std::string name;
 
@@ -142,6 +143,7 @@ public:
   static void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut);
 
   const std::list<Section>& GetSections() const { return sections; }
+
 private:
   std::list<Section> sections;
 
diff --git a/Source/Core/Common/Intrinsics.h b/Source/Core/Common/Intrinsics.h
index 3e3fdb5d29..7e9ca57c76 100644
--- a/Source/Core/Common/Intrinsics.h
+++ b/Source/Core/Common/Intrinsics.h
@@ -25,7 +25,7 @@
  * When building with -march=native, or enabling the instruction sets in the compile flags, permit
  * usage of the instrinsics without any function attributes. If the command-line architecture does
  * not support this instruction set, enable it via function targeting.
-*/
+ */
 
 #include <x86intrin.h>
 #ifndef __SSE4_2__
diff --git a/Source/Core/Common/Lazy.h b/Source/Core/Common/Lazy.h
index f19d5187cb..3e9a79147a 100644
--- a/Source/Core/Common/Lazy.h
+++ b/Source/Core/Common/Lazy.h
@@ -35,6 +35,7 @@ public:
   const T* operator->() const { return ComputeValue(); }
   T& operator*() { return *ComputeValue(); }
   T* operator->() { return ComputeValue(); }
+
 private:
   T* ComputeValue() const
   {
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index 7d910b3a8b..cd66d23944 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -48,6 +48,7 @@ public:
   bool IsValid() const { return m_logfile.good(); }
   bool IsEnabled() const { return m_enable; }
   void SetEnable(bool enable) { m_enable = enable; }
+
 private:
   std::mutex m_log_lock;
   std::ofstream m_logfile;
diff --git a/Source/Core/Common/Profiler.h b/Source/Core/Common/Profiler.h
index bbf4af7f9e..7e0dcb85bd 100644
--- a/Source/Core/Common/Profiler.h
+++ b/Source/Core/Common/Profiler.h
@@ -51,6 +51,7 @@ class ProfilerExecuter
 public:
   ProfilerExecuter(Profiler* _p) : m_p(_p) { m_p->Start(); }
   ~ProfilerExecuter() { m_p->Stop(); }
+
 private:
   Profiler* m_p;
 };
diff --git a/Source/Core/Common/QoSSession.h b/Source/Core/Common/QoSSession.h
index 0f54e1d3d7..c29aab9f5f 100644
--- a/Source/Core/Common/QoSSession.h
+++ b/Source/Core/Common/QoSSession.h
@@ -27,6 +27,7 @@ public:
   QoSSession& operator=(QoSSession&& session);
   QoSSession(QoSSession&& session) { *this = std::move(session); }
   bool Successful() const { return m_success; }
+
 private:
 #if defined(_WIN32)
   void* m_qos_handle = nullptr;
diff --git a/Source/Core/Common/Result.h b/Source/Core/Common/Result.h
index 2c4f47b3d7..6419c43168 100644
--- a/Source/Core/Common/Result.h
+++ b/Source/Core/Common/Result.h
@@ -24,6 +24,7 @@ public:
   const T* operator->() const { return &std::get<T>(m_variant); }
   T& operator*() { return std::get<T>(m_variant); }
   T* operator->() { return &std::get<T>(m_variant); }
+
 private:
   std::variant<ResultCode, T> m_variant;
 };
diff --git a/Source/Core/Common/SDCardUtil.cpp b/Source/Core/Common/SDCardUtil.cpp
index 77c4f00316..3c0d4e6733 100644
--- a/Source/Core/Common/SDCardUtil.cpp
+++ b/Source/Core/Common/SDCardUtil.cpp
@@ -233,17 +233,17 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const std::string& filename)
   }
 
   /* Here's the layout:
-  *
-  *  boot_sector
-  *  fsinfo_sector
-  *  empty
-  *  backup boot sector
-  *  backup fsinfo sector
-  *  RESERVED_SECTORS - 4 empty sectors (if backup sectors), or RESERVED_SECTORS - 2 (if no backup)
-  *  first fat
-  *  second fat
-  *  zero sectors
-  */
+   *
+   *  boot_sector
+   *  fsinfo_sector
+   *  empty
+   *  backup boot sector
+   *  backup fsinfo sector
+   *  RESERVED_SECTORS - 4 empty sectors (if backup sectors), or RESERVED_SECTORS - 2 (if no backup)
+   *  first fat
+   *  second fat
+   *  zero sectors
+   */
 
   if (write_sector(f, s_boot_sector))
     goto FailWrite;
diff --git a/Source/Core/Common/Semaphore.h b/Source/Core/Common/Semaphore.h
index 1d1810a5f0..0c48d2fb4d 100644
--- a/Source/Core/Common/Semaphore.h
+++ b/Source/Core/Common/Semaphore.h
@@ -24,6 +24,7 @@ public:
   ~Semaphore() { CloseHandle(m_handle); }
   void Wait() { WaitForSingleObject(m_handle, INFINITE); }
   void Post() { ReleaseSemaphore(m_handle, 1, nullptr); }
+
 private:
   HANDLE m_handle;
 };
@@ -42,6 +43,7 @@ public:
   ~Semaphore() { sem_destroy(&m_handle); }
   void Wait() { sem_wait(&m_handle); }
   void Post() { sem_post(&m_handle); }
+
 private:
   sem_t m_handle;
 };
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index 4216d0f6f6..cc1ffaa949 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -307,7 +307,7 @@ bool SplitPath(const std::string& full_path, std::string* _pPath, std::string* _
 #ifdef _WIN32
                                           ":"
 #endif
-                                          );
+  );
   if (std::string::npos == dir_end)
     dir_end = 0;
   else
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
index 2bbd0a5990..70111ab710 100644
--- a/Source/Core/Common/x64Emitter.cpp
+++ b/Source/Core/Common/x64Emitter.cpp
@@ -248,7 +248,7 @@ void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
                       bool warn_64bit_offset) const
 {
   if (_operandReg == INVALID_REG)
-    _operandReg = (X64Reg) this->operandReg;
+    _operandReg = (X64Reg)this->operandReg;
   int mod = 0;
   int ireg = indexReg;
   bool SIB = false;