diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h
index 70bc4eb53..cea4b223c 100644
--- a/renderdoc/driver/gl/gl_hookset.h
+++ b/renderdoc/driver/gl/gl_hookset.h
@@ -353,42 +353,42 @@ struct GLHookSet
 	PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
 	PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
 	PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
-	PFNGLVERTEXATTRIB1DPROC glVertexAttrib1d;
-	PFNGLVERTEXATTRIB1DVPROC glVertexAttrib1dv;
-	PFNGLVERTEXATTRIB1FPROC glVertexAttrib1f;
-	PFNGLVERTEXATTRIB1FVPROC glVertexAttrib1fv;
-	PFNGLVERTEXATTRIB1SPROC glVertexAttrib1s;
-	PFNGLVERTEXATTRIB1SVPROC glVertexAttrib1sv;
-	PFNGLVERTEXATTRIB2DPROC glVertexAttrib2d;
-	PFNGLVERTEXATTRIB2DVPROC glVertexAttrib2dv;
-	PFNGLVERTEXATTRIB2FPROC glVertexAttrib2f;
-	PFNGLVERTEXATTRIB2FVPROC glVertexAttrib2fv;
-	PFNGLVERTEXATTRIB2SPROC glVertexAttrib2s;
-	PFNGLVERTEXATTRIB2SVPROC glVertexAttrib2sv;
-	PFNGLVERTEXATTRIB3DPROC glVertexAttrib3d;
-	PFNGLVERTEXATTRIB3DVPROC glVertexAttrib3dv;
-	PFNGLVERTEXATTRIB3FPROC glVertexAttrib3f;
-	PFNGLVERTEXATTRIB3FVPROC glVertexAttrib3fv;
-	PFNGLVERTEXATTRIB3SPROC glVertexAttrib3s;
-	PFNGLVERTEXATTRIB3SVPROC glVertexAttrib3sv;
-	PFNGLVERTEXATTRIB4NBVPROC glVertexAttrib4Nbv;
-	PFNGLVERTEXATTRIB4NIVPROC glVertexAttrib4Niv;
-	PFNGLVERTEXATTRIB4NSVPROC glVertexAttrib4Nsv;
+	PFNGLVERTEXATTRIB1DPROC glVertexAttrib1d; // aliases glVertexAttrib1dARB
+	PFNGLVERTEXATTRIB1DVPROC glVertexAttrib1dv; // aliases glVertexAttrib1dvARB
+	PFNGLVERTEXATTRIB1FPROC glVertexAttrib1f; // aliases glVertexAttrib1fARB
+	PFNGLVERTEXATTRIB1FVPROC glVertexAttrib1fv; // aliases glVertexAttrib1fvARB
+	PFNGLVERTEXATTRIB1SPROC glVertexAttrib1s; // aliases glVertexAttrib1sARB
+	PFNGLVERTEXATTRIB1SVPROC glVertexAttrib1sv; // aliases glVertexAttrib1svARB
+	PFNGLVERTEXATTRIB2DPROC glVertexAttrib2d; // aliases glVertexAttrib2dARB
+	PFNGLVERTEXATTRIB2DVPROC glVertexAttrib2dv; // aliases glVertexAttrib2dvARB
+	PFNGLVERTEXATTRIB2FPROC glVertexAttrib2f; // aliases glVertexAttrib2fARB
+	PFNGLVERTEXATTRIB2FVPROC glVertexAttrib2fv; // aliases glVertexAttrib2fvARB
+	PFNGLVERTEXATTRIB2SPROC glVertexAttrib2s; // aliases glVertexAttrib2sARB
+	PFNGLVERTEXATTRIB2SVPROC glVertexAttrib2sv; // aliases glVertexAttrib2svARB
+	PFNGLVERTEXATTRIB3DPROC glVertexAttrib3d; // aliases glVertexAttrib3dARB
+	PFNGLVERTEXATTRIB3DVPROC glVertexAttrib3dv; // aliases glVertexAttrib3dvARB
+	PFNGLVERTEXATTRIB3FPROC glVertexAttrib3f; // aliases glVertexAttrib3fARB
+	PFNGLVERTEXATTRIB3FVPROC glVertexAttrib3fv; // aliases glVertexAttrib3fvARB
+	PFNGLVERTEXATTRIB3SPROC glVertexAttrib3s; // aliases glVertexAttrib3sARB
+	PFNGLVERTEXATTRIB3SVPROC glVertexAttrib3sv; // aliases glVertexAttrib3svARB
+	PFNGLVERTEXATTRIB4NBVPROC glVertexAttrib4Nbv; // aliases glVertexAttrib4NbvARB
+	PFNGLVERTEXATTRIB4NIVPROC glVertexAttrib4Niv; // aliases glVertexAttrib4NivARB
+	PFNGLVERTEXATTRIB4NSVPROC glVertexAttrib4Nsv; // aliases glVertexAttrib4NsvARB
 	PFNGLVERTEXATTRIB4NUBPROC glVertexAttrib4Nub;
-	PFNGLVERTEXATTRIB4NUBVPROC glVertexAttrib4Nubv;
-	PFNGLVERTEXATTRIB4NUIVPROC glVertexAttrib4Nuiv;
-	PFNGLVERTEXATTRIB4NUSVPROC glVertexAttrib4Nusv;
-	PFNGLVERTEXATTRIB4BVPROC glVertexAttrib4bv;
-	PFNGLVERTEXATTRIB4DPROC glVertexAttrib4d;
-	PFNGLVERTEXATTRIB4DVPROC glVertexAttrib4dv;
-	PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f;
-	PFNGLVERTEXATTRIB4FVPROC glVertexAttrib4fv;
-	PFNGLVERTEXATTRIB4IVPROC glVertexAttrib4iv;
-	PFNGLVERTEXATTRIB4SPROC glVertexAttrib4s;
-	PFNGLVERTEXATTRIB4SVPROC glVertexAttrib4sv;
-	PFNGLVERTEXATTRIB4UBVPROC glVertexAttrib4ubv;
-	PFNGLVERTEXATTRIB4UIVPROC glVertexAttrib4uiv;
-	PFNGLVERTEXATTRIB4USVPROC glVertexAttrib4usv;
+	PFNGLVERTEXATTRIB4NUBVPROC glVertexAttrib4Nubv; // aliases glVertexAttrib4NubvARB
+	PFNGLVERTEXATTRIB4NUIVPROC glVertexAttrib4Nuiv; // aliases glVertexAttrib4NuivARB
+	PFNGLVERTEXATTRIB4NUSVPROC glVertexAttrib4Nusv; // aliases glVertexAttrib4NusvARB
+	PFNGLVERTEXATTRIB4BVPROC glVertexAttrib4bv; // aliases glVertexAttrib4bvARB
+	PFNGLVERTEXATTRIB4DPROC glVertexAttrib4d; // aliases glVertexAttrib4dARB
+	PFNGLVERTEXATTRIB4DVPROC glVertexAttrib4dv; // aliases glVertexAttrib4dvARB
+	PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f; // aliases glVertexAttrib4fARB
+	PFNGLVERTEXATTRIB4FVPROC glVertexAttrib4fv; // aliases glVertexAttrib4fvARB
+	PFNGLVERTEXATTRIB4IVPROC glVertexAttrib4iv; // aliases glVertexAttrib4ivARB
+	PFNGLVERTEXATTRIB4SPROC glVertexAttrib4s; // aliases glVertexAttrib4sARB
+	PFNGLVERTEXATTRIB4SVPROC glVertexAttrib4sv; // aliases glVertexAttrib4svARB
+	PFNGLVERTEXATTRIB4UBVPROC glVertexAttrib4ubv; // aliases glVertexAttrib4ubvARB
+	PFNGLVERTEXATTRIB4UIVPROC glVertexAttrib4uiv; // aliases glVertexAttrib4uivARB
+	PFNGLVERTEXATTRIB4USVPROC glVertexAttrib4usv; // aliases glVertexAttrib4usvARB
 	PFNGLVERTEXATTRIBI1IPROC glVertexAttribI1i;
 	PFNGLVERTEXATTRIBI1IVPROC glVertexAttribI1iv;
 	PFNGLVERTEXATTRIBI1UIPROC glVertexAttribI1ui;
@@ -425,7 +425,7 @@ struct GLHookSet
 	PFNGLVERTEXATTRIBP3UIVPROC glVertexAttribP3uiv;
 	PFNGLVERTEXATTRIBP4UIPROC glVertexAttribP4ui;
 	PFNGLVERTEXATTRIBP4UIVPROC glVertexAttribP4uiv;
-	PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer;
+	PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; // aliases glVertexAttribPointerARB
 	PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer;
 	PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
 	PFNGLVERTEXATTRIBBINDINGPROC glVertexAttribBinding;
@@ -436,8 +436,8 @@ struct GLHookSet
 	PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;
 	PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation;
 	PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed;
-	PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray;
-	PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray;
+	PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray; // aliases glEnableVertexAttribArrayARB
+	PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray; // aliases glDisableVertexAttribArrayARB
 	PFNGLBINDVERTEXBUFFERPROC glBindVertexBuffer;
 	PFNGLBINDVERTEXBUFFERSPROC glBindVertexBuffers;
 	PFNGLVERTEXBINDINGDIVISORPROC glVertexBindingDivisor;
diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h
index 798dab6c6..18108687c 100644
--- a/renderdoc/driver/gl/gl_hookset_defs.h
+++ b/renderdoc/driver/gl/gl_hookset_defs.h
@@ -428,41 +428,76 @@
     HookExtension(PFNGLBINDVERTEXARRAYPROC, glBindVertexArray); \
     HookExtension(PFNGLDELETEVERTEXARRAYSPROC, glDeleteVertexArrays); \
     HookExtension(PFNGLVERTEXATTRIB1DPROC, glVertexAttrib1d); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB1DPROC, glVertexAttrib1d, glVertexAttrib1dARB); \
     HookExtension(PFNGLVERTEXATTRIB1DVPROC, glVertexAttrib1dv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB1DVPROC, glVertexAttrib1dv, glVertexAttrib1dvARB); \
     HookExtension(PFNGLVERTEXATTRIB1FPROC, glVertexAttrib1f); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB1FPROC, glVertexAttrib1f, glVertexAttrib1fARB); \
     HookExtension(PFNGLVERTEXATTRIB1FVPROC, glVertexAttrib1fv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB1FVPROC, glVertexAttrib1fv, glVertexAttrib1fvARB); \
     HookExtension(PFNGLVERTEXATTRIB1SPROC, glVertexAttrib1s); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB1SPROC, glVertexAttrib1s, glVertexAttrib1sARB); \
     HookExtension(PFNGLVERTEXATTRIB1SVPROC, glVertexAttrib1sv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB1SVPROC, glVertexAttrib1sv, glVertexAttrib1svARB); \
     HookExtension(PFNGLVERTEXATTRIB2DPROC, glVertexAttrib2d); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB2DPROC, glVertexAttrib2d, glVertexAttrib2dARB); \
     HookExtension(PFNGLVERTEXATTRIB2DVPROC, glVertexAttrib2dv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB2DVPROC, glVertexAttrib2dv, glVertexAttrib2dvARB); \
     HookExtension(PFNGLVERTEXATTRIB2FPROC, glVertexAttrib2f); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB2FPROC, glVertexAttrib2f, glVertexAttrib2fARB); \
     HookExtension(PFNGLVERTEXATTRIB2FVPROC, glVertexAttrib2fv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB2FVPROC, glVertexAttrib2fv, glVertexAttrib2fvARB); \
     HookExtension(PFNGLVERTEXATTRIB2SPROC, glVertexAttrib2s); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB2SPROC, glVertexAttrib2s, glVertexAttrib2sARB); \
     HookExtension(PFNGLVERTEXATTRIB2SVPROC, glVertexAttrib2sv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB2SVPROC, glVertexAttrib2sv, glVertexAttrib2svARB); \
     HookExtension(PFNGLVERTEXATTRIB3DPROC, glVertexAttrib3d); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB3DPROC, glVertexAttrib3d, glVertexAttrib3dARB); \
     HookExtension(PFNGLVERTEXATTRIB3DVPROC, glVertexAttrib3dv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB3DVPROC, glVertexAttrib3dv, glVertexAttrib3dvARB); \
     HookExtension(PFNGLVERTEXATTRIB3FPROC, glVertexAttrib3f); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB3FPROC, glVertexAttrib3f, glVertexAttrib3fARB); \
     HookExtension(PFNGLVERTEXATTRIB3FVPROC, glVertexAttrib3fv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB3FVPROC, glVertexAttrib3fv, glVertexAttrib3fvARB); \
     HookExtension(PFNGLVERTEXATTRIB3SPROC, glVertexAttrib3s); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB3SPROC, glVertexAttrib3s, glVertexAttrib3sARB); \
     HookExtension(PFNGLVERTEXATTRIB3SVPROC, glVertexAttrib3sv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB3SVPROC, glVertexAttrib3sv, glVertexAttrib3svARB); \
     HookExtension(PFNGLVERTEXATTRIB4NBVPROC, glVertexAttrib4Nbv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4NBVPROC, glVertexAttrib4Nbv, glVertexAttrib4NbvARB); \
     HookExtension(PFNGLVERTEXATTRIB4NIVPROC, glVertexAttrib4Niv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4NIVPROC, glVertexAttrib4Niv, glVertexAttrib4NivARB); \
     HookExtension(PFNGLVERTEXATTRIB4NSVPROC, glVertexAttrib4Nsv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4NSVPROC, glVertexAttrib4Nsv, glVertexAttrib4NsvARB); \
     HookExtension(PFNGLVERTEXATTRIB4NUBPROC, glVertexAttrib4Nub); \
     HookExtension(PFNGLVERTEXATTRIB4NUBVPROC, glVertexAttrib4Nubv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4NUBVPROC, glVertexAttrib4Nubv, glVertexAttrib4NubvARB); \
     HookExtension(PFNGLVERTEXATTRIB4NUIVPROC, glVertexAttrib4Nuiv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4NUIVPROC, glVertexAttrib4Nuiv, glVertexAttrib4NuivARB); \
     HookExtension(PFNGLVERTEXATTRIB4NUSVPROC, glVertexAttrib4Nusv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4NUSVPROC, glVertexAttrib4Nusv, glVertexAttrib4NusvARB); \
     HookExtension(PFNGLVERTEXATTRIB4BVPROC, glVertexAttrib4bv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4BVPROC, glVertexAttrib4bv, glVertexAttrib4bvARB); \
     HookExtension(PFNGLVERTEXATTRIB4DPROC, glVertexAttrib4d); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4DPROC, glVertexAttrib4d, glVertexAttrib4dARB); \
     HookExtension(PFNGLVERTEXATTRIB4DVPROC, glVertexAttrib4dv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4DVPROC, glVertexAttrib4dv, glVertexAttrib4dvARB); \
     HookExtension(PFNGLVERTEXATTRIB4FPROC, glVertexAttrib4f); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4FPROC, glVertexAttrib4f, glVertexAttrib4fARB); \
     HookExtension(PFNGLVERTEXATTRIB4FVPROC, glVertexAttrib4fv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4FVPROC, glVertexAttrib4fv, glVertexAttrib4fvARB); \
     HookExtension(PFNGLVERTEXATTRIB4IVPROC, glVertexAttrib4iv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4IVPROC, glVertexAttrib4iv, glVertexAttrib4ivARB); \
     HookExtension(PFNGLVERTEXATTRIB4SPROC, glVertexAttrib4s); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4SPROC, glVertexAttrib4s, glVertexAttrib4sARB); \
     HookExtension(PFNGLVERTEXATTRIB4SVPROC, glVertexAttrib4sv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4SVPROC, glVertexAttrib4sv, glVertexAttrib4svARB); \
     HookExtension(PFNGLVERTEXATTRIB4UBVPROC, glVertexAttrib4ubv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4UBVPROC, glVertexAttrib4ubv, glVertexAttrib4ubvARB); \
     HookExtension(PFNGLVERTEXATTRIB4UIVPROC, glVertexAttrib4uiv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4UIVPROC, glVertexAttrib4uiv, glVertexAttrib4uivARB); \
     HookExtension(PFNGLVERTEXATTRIB4USVPROC, glVertexAttrib4usv); \
+    HookExtensionAlias(PFNGLVERTEXATTRIB4USVPROC, glVertexAttrib4usv, glVertexAttrib4usvARB); \
     HookExtension(PFNGLVERTEXATTRIBI1IPROC, glVertexAttribI1i); \
     HookExtension(PFNGLVERTEXATTRIBI1IVPROC, glVertexAttribI1iv); \
     HookExtension(PFNGLVERTEXATTRIBI1UIPROC, glVertexAttribI1ui); \
@@ -500,6 +535,7 @@
     HookExtension(PFNGLVERTEXATTRIBP4UIPROC, glVertexAttribP4ui); \
     HookExtension(PFNGLVERTEXATTRIBP4UIVPROC, glVertexAttribP4uiv); \
     HookExtension(PFNGLVERTEXATTRIBPOINTERPROC, glVertexAttribPointer); \
+    HookExtensionAlias(PFNGLVERTEXATTRIBPOINTERPROC, glVertexAttribPointer, glVertexAttribPointerARB); \
     HookExtension(PFNGLVERTEXATTRIBIPOINTERPROC, glVertexAttribIPointer); \
     HookExtension(PFNGLVERTEXATTRIBLPOINTERPROC, glVertexAttribLPointer); \
     HookExtension(PFNGLVERTEXATTRIBBINDINGPROC, glVertexAttribBinding); \
@@ -511,7 +547,9 @@
     HookExtension(PFNGLBINDFRAGDATALOCATIONPROC, glBindFragDataLocation); \
     HookExtension(PFNGLBINDFRAGDATALOCATIONINDEXEDPROC, glBindFragDataLocationIndexed); \
     HookExtension(PFNGLENABLEVERTEXATTRIBARRAYPROC, glEnableVertexAttribArray); \
+    HookExtensionAlias(PFNGLENABLEVERTEXATTRIBARRAYPROC, glEnableVertexAttribArray, glEnableVertexAttribArrayARB); \
     HookExtension(PFNGLDISABLEVERTEXATTRIBARRAYPROC, glDisableVertexAttribArray); \
+    HookExtensionAlias(PFNGLDISABLEVERTEXATTRIBARRAYPROC, glDisableVertexAttribArray, glDisableVertexAttribArrayARB); \
     HookExtension(PFNGLBINDVERTEXBUFFERPROC, glBindVertexBuffer); \
     HookExtension(PFNGLBINDVERTEXBUFFERSPROC, glBindVertexBuffers); \
     HookExtension(PFNGLVERTEXBINDINGDIVISORPROC, glVertexBindingDivisor); \