diff --git a/renderdoc/driver/gl/gl_hookset.h b/renderdoc/driver/gl/gl_hookset.h
index 74ff95774..70bc4eb53 100644
--- a/renderdoc/driver/gl/gl_hookset.h
+++ b/renderdoc/driver/gl/gl_hookset.h
@@ -112,7 +112,7 @@ struct GLHookSet
 	PFNGLTEXTUREVIEWPROC glTextureView;
 	PFNGLTEXPARAMETERIIVPROC glTexParameterIiv;
 	PFNGLTEXPARAMETERIUIVPROC glTexParameterIuiv;
-	PFNGLGENERATEMIPMAPPROC glGenerateMipmap;
+	PFNGLGENERATEMIPMAPPROC glGenerateMipmap; // aliases glGenerateMipmapEXT
 	PFNGLCOPYIMAGESUBDATAPROC glCopyImageSubData;
 	PFNGLCOPYTEXIMAGE1DPROC glCopyTexImage1D;
 	PFNGLCOPYTEXIMAGE2DPROC glCopyTexImage2D;
@@ -154,9 +154,9 @@ struct GLHookSet
 	PFNGLGETOBJECTLABELPROC glGetObjectLabel;
 	PFNGLGETOBJECTPTRLABELPROC glGetObjectPtrLabel;
 	PFNGLGETDEBUGMESSAGELOGPROC glGetDebugMessageLog; // aliases glGetDebugMessageLogARB
-	PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv;
+	PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC glGetFramebufferAttachmentParameteriv; // aliases glGetFramebufferAttachmentParameterivEXT
 	PFNGLGETFRAMEBUFFERPARAMETERIVPROC glGetFramebufferParameteriv;
-	PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv;
+	PFNGLGETRENDERBUFFERPARAMETERIVPROC glGetRenderbufferParameteriv; // aliases glGetRenderbufferParameterivEXT
 	PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv;
 	PFNGLGETQUERYINDEXEDIVPROC glGetQueryIndexediv;
 	PFNGLGETQUERYOBJECTUI64VPROC glGetQueryObjectui64v; // aliases glGetQueryObjectui64vEXT
@@ -228,7 +228,7 @@ struct GLHookSet
 	PFNGLGETVERTEXATTRIBFVPROC glGetVertexAttribfv;
 	PFNGLGETNAMEDBUFFERPARAMETERI64VPROC glGetNamedBufferParameteri64v;
 	PFNGLGETNAMEDBUFFERPOINTERVPROC glGetNamedBufferPointerv;
-	PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus;
+	PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; // aliases glCheckFramebufferStatusEXT
 	PFNGLBLENDCOLORPROC glBlendColor;
 	PFNGLBLENDFUNCIPROC glBlendFunci; // aliases glBlendFunciARB
 	PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; // aliases glBlendFuncSeparateARB
@@ -284,11 +284,11 @@ struct GLHookSet
 	PFNGLDISABLEIPROC glDisablei; // aliases glDisableIndexedEXT
 	PFNGLISENABLEDIPROC glIsEnabledi; // aliases glIsEnabledIndexedEXT
 	PFNGLISBUFFERPROC glIsBuffer; // aliases glIsBufferARB
-	PFNGLISFRAMEBUFFERPROC glIsFramebuffer;
+	PFNGLISFRAMEBUFFERPROC glIsFramebuffer; // aliases glIsFramebufferEXT
 	PFNGLISPROGRAMPROC glIsProgram;
 	PFNGLISPROGRAMPIPELINEPROC glIsProgramPipeline;
 	PFNGLISQUERYPROC glIsQuery; // aliases glIsQueryARB
-	PFNGLISRENDERBUFFERPROC glIsRenderbuffer;
+	PFNGLISRENDERBUFFERPROC glIsRenderbuffer; // aliases glIsRenderbufferEXT
 	PFNGLISSAMPLERPROC glIsSampler;
 	PFNGLISSHADERPROC glIsShader;
 	PFNGLISSYNCPROC glIsSync;
@@ -297,21 +297,21 @@ struct GLHookSet
 	PFNGLGENBUFFERSPROC glGenBuffers; // aliases glGenBuffersARB
 	PFNGLBINDBUFFERPROC glBindBuffer; // aliases glBindBufferARB
 	PFNGLDRAWBUFFERSPROC glDrawBuffers;
-	PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers;
-	PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
+	PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; // aliases glGenFramebuffersEXT
+	PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; // aliases glBindFramebufferEXT
 	PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
-	PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D;
-	PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D;
-	PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D;
-	PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer;
+	PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D; // aliases glFramebufferTexture1DEXT
+	PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; // aliases glFramebufferTexture2DEXT
+	PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D; // aliases glFramebufferTexture3DEXT
+	PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer; // aliases glFramebufferRenderbufferEXT
 	PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer;
 	PFNGLFRAMEBUFFERPARAMETERIPROC glFramebufferParameteri;
-	PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers;
-	PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers;
-	PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage;
+	PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; // aliases glDeleteFramebuffersEXT
+	PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; // aliases glGenRenderbuffersEXT
+	PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; // aliases glRenderbufferStorageEXT
 	PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC glRenderbufferStorageMultisample;
-	PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers;
-	PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;
+	PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers; // aliases glDeleteRenderbuffersEXT
+	PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; // aliases glBindRenderbufferEXT
 	PFNGLFENCESYNCPROC glFenceSync;
 	PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
 	PFNGLWAITSYNCPROC glWaitSync;
diff --git a/renderdoc/driver/gl/gl_hookset_defs.h b/renderdoc/driver/gl/gl_hookset_defs.h
index 4de477bee..798dab6c6 100644
--- a/renderdoc/driver/gl/gl_hookset_defs.h
+++ b/renderdoc/driver/gl/gl_hookset_defs.h
@@ -123,6 +123,7 @@
     HookExtension(PFNGLTEXPARAMETERIIVPROC, glTexParameterIiv); \
     HookExtension(PFNGLTEXPARAMETERIUIVPROC, glTexParameterIuiv); \
     HookExtension(PFNGLGENERATEMIPMAPPROC, glGenerateMipmap); \
+    HookExtensionAlias(PFNGLGENERATEMIPMAPPROC, glGenerateMipmap, glGenerateMipmapEXT); \
     HookExtension(PFNGLCOPYIMAGESUBDATAPROC, glCopyImageSubData); \
     HookExtension(PFNGLCOPYTEXIMAGE1DPROC, glCopyTexImage1D); \
     HookExtension(PFNGLCOPYTEXIMAGE2DPROC, glCopyTexImage2D); \
@@ -171,8 +172,10 @@
     HookExtension(PFNGLGETDEBUGMESSAGELOGPROC, glGetDebugMessageLog); \
     HookExtensionAlias(PFNGLGETDEBUGMESSAGELOGPROC, glGetDebugMessageLog, glGetDebugMessageLogARB); \
     HookExtension(PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC, glGetFramebufferAttachmentParameteriv); \
+    HookExtensionAlias(PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameterivEXT); \
     HookExtension(PFNGLGETFRAMEBUFFERPARAMETERIVPROC, glGetFramebufferParameteriv); \
     HookExtension(PFNGLGETRENDERBUFFERPARAMETERIVPROC, glGetRenderbufferParameteriv); \
+    HookExtensionAlias(PFNGLGETRENDERBUFFERPARAMETERIVPROC, glGetRenderbufferParameteriv, glGetRenderbufferParameterivEXT); \
     HookExtension(PFNGLGETMULTISAMPLEFVPROC, glGetMultisamplefv); \
     HookExtension(PFNGLGETQUERYINDEXEDIVPROC, glGetQueryIndexediv); \
     HookExtension(PFNGLGETQUERYOBJECTUI64VPROC, glGetQueryObjectui64v); \
@@ -260,6 +263,7 @@
     HookExtension(PFNGLGETNAMEDBUFFERPARAMETERI64VPROC, glGetNamedBufferParameteri64v); \
     HookExtension(PFNGLGETNAMEDBUFFERPOINTERVPROC, glGetNamedBufferPointerv); \
     HookExtension(PFNGLCHECKFRAMEBUFFERSTATUSPROC, glCheckFramebufferStatus); \
+    HookExtensionAlias(PFNGLCHECKFRAMEBUFFERSTATUSPROC, glCheckFramebufferStatus, glCheckFramebufferStatusEXT); \
     HookExtension(PFNGLBLENDCOLORPROC, glBlendColor); \
     HookExtension(PFNGLBLENDFUNCIPROC, glBlendFunci); \
     HookExtensionAlias(PFNGLBLENDFUNCIPROC, glBlendFunci, glBlendFunciARB); \
@@ -330,11 +334,13 @@
     HookExtension(PFNGLISBUFFERPROC, glIsBuffer); \
     HookExtensionAlias(PFNGLISBUFFERPROC, glIsBuffer, glIsBufferARB); \
     HookExtension(PFNGLISFRAMEBUFFERPROC, glIsFramebuffer); \
+    HookExtensionAlias(PFNGLISFRAMEBUFFERPROC, glIsFramebuffer, glIsFramebufferEXT); \
     HookExtension(PFNGLISPROGRAMPROC, glIsProgram); \
     HookExtension(PFNGLISPROGRAMPIPELINEPROC, glIsProgramPipeline); \
     HookExtension(PFNGLISQUERYPROC, glIsQuery); \
     HookExtensionAlias(PFNGLISQUERYPROC, glIsQuery, glIsQueryARB); \
     HookExtension(PFNGLISRENDERBUFFERPROC, glIsRenderbuffer); \
+    HookExtensionAlias(PFNGLISRENDERBUFFERPROC, glIsRenderbuffer, glIsRenderbufferEXT); \
     HookExtension(PFNGLISSAMPLERPROC, glIsSampler); \
     HookExtension(PFNGLISSHADERPROC, glIsShader); \
     HookExtension(PFNGLISSYNCPROC, glIsSync); \
@@ -346,20 +352,31 @@
     HookExtensionAlias(PFNGLBINDBUFFERPROC, glBindBuffer, glBindBufferARB); \
     HookExtension(PFNGLDRAWBUFFERSPROC, glDrawBuffers); \
     HookExtension(PFNGLGENFRAMEBUFFERSPROC, glGenFramebuffers); \
+    HookExtensionAlias(PFNGLGENFRAMEBUFFERSPROC, glGenFramebuffers, glGenFramebuffersEXT); \
     HookExtension(PFNGLBINDFRAMEBUFFERPROC, glBindFramebuffer); \
+    HookExtensionAlias(PFNGLBINDFRAMEBUFFERPROC, glBindFramebuffer, glBindFramebufferEXT); \
     HookExtension(PFNGLFRAMEBUFFERTEXTUREPROC, glFramebufferTexture); \
     HookExtension(PFNGLFRAMEBUFFERTEXTURE1DPROC, glFramebufferTexture1D); \
+    HookExtensionAlias(PFNGLFRAMEBUFFERTEXTURE1DPROC, glFramebufferTexture1D, glFramebufferTexture1DEXT); \
     HookExtension(PFNGLFRAMEBUFFERTEXTURE2DPROC, glFramebufferTexture2D); \
+    HookExtensionAlias(PFNGLFRAMEBUFFERTEXTURE2DPROC, glFramebufferTexture2D, glFramebufferTexture2DEXT); \
     HookExtension(PFNGLFRAMEBUFFERTEXTURE3DPROC, glFramebufferTexture3D); \
+    HookExtensionAlias(PFNGLFRAMEBUFFERTEXTURE3DPROC, glFramebufferTexture3D, glFramebufferTexture3DEXT); \
     HookExtension(PFNGLFRAMEBUFFERRENDERBUFFERPROC, glFramebufferRenderbuffer); \
+    HookExtensionAlias(PFNGLFRAMEBUFFERRENDERBUFFERPROC, glFramebufferRenderbuffer, glFramebufferRenderbufferEXT); \
     HookExtension(PFNGLFRAMEBUFFERTEXTURELAYERPROC, glFramebufferTextureLayer); \
     HookExtension(PFNGLFRAMEBUFFERPARAMETERIPROC, glFramebufferParameteri); \
     HookExtension(PFNGLDELETEFRAMEBUFFERSPROC, glDeleteFramebuffers); \
+    HookExtensionAlias(PFNGLDELETEFRAMEBUFFERSPROC, glDeleteFramebuffers, glDeleteFramebuffersEXT); \
     HookExtension(PFNGLGENRENDERBUFFERSPROC, glGenRenderbuffers); \
+    HookExtensionAlias(PFNGLGENRENDERBUFFERSPROC, glGenRenderbuffers, glGenRenderbuffersEXT); \
     HookExtension(PFNGLRENDERBUFFERSTORAGEPROC, glRenderbufferStorage); \
+    HookExtensionAlias(PFNGLRENDERBUFFERSTORAGEPROC, glRenderbufferStorage, glRenderbufferStorageEXT); \
     HookExtension(PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample); \
     HookExtension(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers); \
+    HookExtensionAlias(PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers, glDeleteRenderbuffersEXT); \
     HookExtension(PFNGLBINDRENDERBUFFERPROC, glBindRenderbuffer); \
+    HookExtensionAlias(PFNGLBINDRENDERBUFFERPROC, glBindRenderbuffer, glBindRenderbufferEXT); \
     HookExtension(PFNGLFENCESYNCPROC, glFenceSync); \
     HookExtension(PFNGLCLIENTWAITSYNCPROC, glClientWaitSync); \
     HookExtension(PFNGLWAITSYNCPROC, glWaitSync); \