diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h
index 246580d18..35fa5662e 100644
--- a/renderdoc/driver/gl/gl_hookset.h
+++ b/renderdoc/driver/gl/gl_hookset.h
@@ -87,7 +87,7 @@ struct GLHookSet
 	// --
 
 	// ++ glext
-	PFNGLACTIVETEXTUREPROC glActiveTexture;
+	PFNGLACTIVETEXTUREPROC glActiveTexture; // aliases glActiveTextureARB
 	PFNGLTEXSTORAGE1DPROC glTexStorage1D;
 	PFNGLTEXSTORAGE2DPROC glTexStorage2D;
 	PFNGLTEXSTORAGE3DPROC glTexStorage3D;
@@ -281,8 +281,8 @@ struct GLHookSet
 	PFNGLISSYNCPROC glIsSync;
 	PFNGLISTRANSFORMFEEDBACKPROC glIsTransformFeedback;
 	PFNGLISVERTEXARRAYPROC glIsVertexArray;
-	PFNGLGENBUFFERSPROC glGenBuffers;
-	PFNGLBINDBUFFERPROC glBindBuffer;
+	PFNGLGENBUFFERSPROC glGenBuffers; // aliases glGenBuffersARB
+	PFNGLBINDBUFFERPROC glBindBuffer; // aliases glBindBufferARB
 	PFNGLDRAWBUFFERSPROC glDrawBuffers;
 	PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
 	PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
@@ -307,7 +307,7 @@ struct GLHookSet
 	PFNGLENDQUERYPROC glEndQuery;
 	PFNGLQUERYCOUNTERPROC glQueryCounter;
 	PFNGLDELETEQUERIESPROC glDeleteQueries;
-	PFNGLBUFFERDATAPROC glBufferData;
+	PFNGLBUFFERDATAPROC glBufferData; // aliases glBufferDataARB
 	PFNGLBUFFERSTORAGEPROC glBufferStorage;
 	PFNGLBUFFERSUBDATAPROC glBufferSubData;
 	PFNGLCOPYBUFFERSUBDATAPROC glCopyBufferSubData;
@@ -315,11 +315,11 @@ struct GLHookSet
 	PFNGLBINDBUFFERRANGEPROC glBindBufferRange;
 	PFNGLBINDBUFFERSBASEPROC glBindBuffersBase;
 	PFNGLBINDBUFFERSRANGEPROC glBindBuffersRange;
-	PFNGLMAPBUFFERPROC glMapBuffer;
+	PFNGLMAPBUFFERPROC glMapBuffer; // aliases glMapBufferARB
 	PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
 	PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
-	PFNGLUNMAPBUFFERPROC glUnmapBuffer;
-	PFNGLDELETEBUFFERSPROC glDeleteBuffers;
+	PFNGLUNMAPBUFFERPROC glUnmapBuffer; // aliases glUnmapBufferARB
+	PFNGLDELETEBUFFERSPROC glDeleteBuffers; // aliases glDeleteBuffersARB
 	PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
 	PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
 	PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;
@@ -425,8 +425,8 @@ struct GLHookSet
 	PFNGLSAMPLERPARAMETERIUIVPROC glSamplerParameterIuiv;
 	PFNGLPATCHPARAMETERIPROC glPatchParameteri;
 	PFNGLPATCHPARAMETERFVPROC glPatchParameterfv;
-	PFNGLPOINTPARAMETERFPROC glPointParameterf;
-	PFNGLPOINTPARAMETERFVPROC glPointParameterfv;
+	PFNGLPOINTPARAMETERFPROC glPointParameterf; // aliases glPointParameterfARB
+	PFNGLPOINTPARAMETERFVPROC glPointParameterfv; // aliases glPointParameterfvARB
 	PFNGLPOINTPARAMETERIPROC glPointParameteri;
 	PFNGLPOINTPARAMETERIVPROC glPointParameteriv;
 	PFNGLDISPATCHCOMPUTEPROC glDispatchCompute;
diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h
index 588cc3fc5..6449970f6 100644
--- a/renderdoc/driver/gl/gl_hookset_defs.h
+++ b/renderdoc/driver/gl/gl_hookset_defs.h
@@ -91,6 +91,7 @@
 // gl extensions
 #define HookCheckGLExtensions() \
     HookExtension(PFNGLACTIVETEXTUREPROC, glActiveTexture); \
+    HookExtensionAlias(PFNGLACTIVETEXTUREPROC, glActiveTexture, glActiveTextureARB); \
     HookExtension(PFNGLTEXSTORAGE1DPROC, glTexStorage1D); \
     HookExtension(PFNGLTEXSTORAGE2DPROC, glTexStorage2D); \
     HookExtension(PFNGLTEXSTORAGE3DPROC, glTexStorage3D); \
@@ -301,7 +302,9 @@
     HookExtension(PFNGLISTRANSFORMFEEDBACKPROC, glIsTransformFeedback); \
     HookExtension(PFNGLISVERTEXARRAYPROC, glIsVertexArray); \
     HookExtension(PFNGLGENBUFFERSPROC, glGenBuffers); \
+    HookExtensionAlias(PFNGLGENBUFFERSPROC, glGenBuffers, glGenBuffersARB); \
     HookExtension(PFNGLBINDBUFFERPROC, glBindBuffer); \
+    HookExtensionAlias(PFNGLBINDBUFFERPROC, glBindBuffer, glBindBufferARB); \
     HookExtension(PFNGLDRAWBUFFERSPROC, glDrawBuffers); \
     HookExtension(PFNGLGENFRAMEBUFFERSPROC, glGenFramebuffers); \
     HookExtension(PFNGLBINDFRAMEBUFFERPROC, glBindFramebuffer); \
@@ -327,6 +330,7 @@
     HookExtension(PFNGLQUERYCOUNTERPROC, glQueryCounter); \
     HookExtension(PFNGLDELETEQUERIESPROC, glDeleteQueries); \
     HookExtension(PFNGLBUFFERDATAPROC, glBufferData); \
+    HookExtensionAlias(PFNGLBUFFERDATAPROC, glBufferData, glBufferDataARB); \
     HookExtension(PFNGLBUFFERSTORAGEPROC, glBufferStorage); \
     HookExtension(PFNGLBUFFERSUBDATAPROC, glBufferSubData); \
     HookExtension(PFNGLCOPYBUFFERSUBDATAPROC, glCopyBufferSubData); \
@@ -335,10 +339,13 @@
     HookExtension(PFNGLBINDBUFFERSBASEPROC, glBindBuffersBase); \
     HookExtension(PFNGLBINDBUFFERSRANGEPROC, glBindBuffersRange); \
     HookExtension(PFNGLMAPBUFFERPROC, glMapBuffer); \
+    HookExtensionAlias(PFNGLMAPBUFFERPROC, glMapBuffer, glMapBufferARB); \
     HookExtension(PFNGLMAPBUFFERRANGEPROC, glMapBufferRange); \
     HookExtension(PFNGLFLUSHMAPPEDBUFFERRANGEPROC, glFlushMappedBufferRange); \
     HookExtension(PFNGLUNMAPBUFFERPROC, glUnmapBuffer); \
+    HookExtensionAlias(PFNGLUNMAPBUFFERPROC, glUnmapBuffer, glUnmapBufferARB); \
     HookExtension(PFNGLDELETEBUFFERSPROC, glDeleteBuffers); \
+    HookExtensionAlias(PFNGLDELETEBUFFERSPROC, glDeleteBuffers, glDeleteBuffersARB); \
     HookExtension(PFNGLGENVERTEXARRAYSPROC, glGenVertexArrays); \
     HookExtension(PFNGLBINDVERTEXARRAYPROC, glBindVertexArray); \
     HookExtension(PFNGLDELETEVERTEXARRAYSPROC, glDeleteVertexArrays); \
@@ -445,7 +452,9 @@
     HookExtension(PFNGLPATCHPARAMETERIPROC, glPatchParameteri); \
     HookExtension(PFNGLPATCHPARAMETERFVPROC, glPatchParameterfv); \
     HookExtension(PFNGLPOINTPARAMETERFPROC, glPointParameterf); \
+    HookExtensionAlias(PFNGLPOINTPARAMETERFPROC, glPointParameterf, glPointParameterfARB); \
     HookExtension(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv); \
+    HookExtensionAlias(PFNGLPOINTPARAMETERFVPROC, glPointParameterfv, glPointParameterfvARB); \
     HookExtension(PFNGLPOINTPARAMETERIPROC, glPointParameteri); \
     HookExtension(PFNGLPOINTPARAMETERIVPROC, glPointParameteriv); \
     HookExtension(PFNGLDISPATCHCOMPUTEPROC, glDispatchCompute); \