diff --git a/src/mapi/glapi/gen/apiexec.py b/src/mapi/glapi/gen/apiexec.py
index 61eda4b0f9..3a80a5acc9 100644
--- a/src/mapi/glapi/gen/apiexec.py
+++ b/src/mapi/glapi/gen/apiexec.py
@@ -155,103 +155,103 @@ functions = {
 
     # OpenGL 4.5 / GL_ARB_direct_state_access.   Mesa can expose the extension
     # with core profile.
-    "CreateTransformFeedbacks": exec_info(core=31),
-    "TransformFeedbackBufferBase": exec_info(core=31),
-    "TransformFeedbackBufferRange": exec_info(core=31),
-    "GetTransformFeedbackiv": exec_info(core=31),
-    "GetTransformFeedbacki_v": exec_info(core=31),
-    "GetTransformFeedbacki64_v": exec_info(core=31),
-    "CreateBuffers": exec_info(core=31),
-    "NamedBufferStorage": exec_info(core=31),
-    "NamedBufferData": exec_info(core=31),
-    "NamedBufferSubData": exec_info(core=31),
-    "CopyNamedBufferSubData": exec_info(core=31),
-    "ClearNamedBufferData": exec_info(core=31),
-    "ClearNamedBufferSubData": exec_info(core=31),
-    "MapNamedBuffer": exec_info(core=31),
-    "MapNamedBufferRange": exec_info(core=31),
-    "UnmapNamedBuffer": exec_info(core=31),
-    "FlushMappedNamedBufferRange": exec_info(core=31),
-    "GetNamedBufferParameteriv": exec_info(core=31),
-    "GetNamedBufferParameteri64v": exec_info(core=31),
-    "GetNamedBufferPointerv": exec_info(core=31),
-    "GetNamedBufferSubData": exec_info(core=31),
-    "CreateFramebuffers": exec_info(core=31),
-    "NamedFramebufferRenderbuffer": exec_info(core=31),
-    "NamedFramebufferParameteri": exec_info(core=31),
-    "NamedFramebufferTexture": exec_info(core=31),
-    "NamedFramebufferTextureLayer": exec_info(core=31),
-    "NamedFramebufferDrawBuffer": exec_info(core=31),
-    "NamedFramebufferDrawBuffers": exec_info(core=31),
-    "NamedFramebufferReadBuffer": exec_info(core=31),
-    "InvalidateNamedFramebufferData": exec_info(core=31),
-    "InvalidateNamedFramebufferSubData": exec_info(core=31),
-    "ClearNamedFramebufferiv": exec_info(core=31),
-    "ClearNamedFramebufferuiv": exec_info(core=31),
-    "ClearNamedFramebufferfv": exec_info(core=31),
-    "ClearNamedFramebufferfi": exec_info(core=31),
-    "BlitNamedFramebuffer": exec_info(core=31),
-    "CheckNamedFramebufferStatus": exec_info(core=31),
-    "GetNamedFramebufferParameteriv": exec_info(core=31),
-    "GetNamedFramebufferAttachmentParameteriv": exec_info(core=31),
-    "CreateRenderbuffers": exec_info(core=31),
-    "NamedRenderbufferStorage": exec_info(core=31),
-    "NamedRenderbufferStorageMultisample": exec_info(core=31),
-    "GetNamedRenderbufferParameteriv": exec_info(core=31),
-    "CreateTextures": exec_info(core=31),
-    "TextureBuffer": exec_info(core=31),
-    "TextureBufferRange": exec_info(core=31),
-    "TextureStorage1D": exec_info(core=31),
-    "TextureStorage2D": exec_info(core=31),
-    "TextureStorage3D": exec_info(core=31),
-    "TextureStorage2DMultisample": exec_info(core=31),
-    "TextureStorage3DMultisample": exec_info(core=31),
-    "TextureSubImage1D": exec_info(core=31),
-    "TextureSubImage2D": exec_info(core=31),
-    "TextureSubImage3D": exec_info(core=31),
-    "CompressedTextureSubImage1D": exec_info(core=31),
-    "CompressedTextureSubImage2D": exec_info(core=31),
-    "CompressedTextureSubImage3D": exec_info(core=31),
-    "CopyTextureSubImage1D": exec_info(core=31),
-    "CopyTextureSubImage2D": exec_info(core=31),
-    "CopyTextureSubImage3D": exec_info(core=31),
-    "TextureParameterf": exec_info(core=31),
-    "TextureParameterfv": exec_info(core=31),
-    "TextureParameteri": exec_info(core=31),
-    "TextureParameterIiv": exec_info(core=31),
-    "TextureParameterIuiv": exec_info(core=31),
-    "TextureParameteriv": exec_info(core=31),
-    "GenerateTextureMipmap": exec_info(core=31),
-    "BindTextureUnit": exec_info(core=31),
-    "GetTextureImage": exec_info(core=31),
-    "GetCompressedTextureImage": exec_info(core=31),
-    "GetTextureLevelParameterfv": exec_info(core=31),
-    "GetTextureLevelParameteriv": exec_info(core=31),
-    "GetTextureParameterfv": exec_info(core=31),
-    "GetTextureParameterIiv": exec_info(core=31),
-    "GetTextureParameterIuiv": exec_info(core=31),
-    "GetTextureParameteriv": exec_info(core=31),
-    "CreateVertexArrays": exec_info(core=31),
-    "DisableVertexArrayAttrib": exec_info(core=31),
-    "EnableVertexArrayAttrib": exec_info(core=31),
-    "VertexArrayElementBuffer": exec_info(core=31),
-    "VertexArrayVertexBuffer": exec_info(core=31),
-    "VertexArrayVertexBuffers": exec_info(core=31),
-    "VertexArrayAttribFormat": exec_info(core=31),
-    "VertexArrayAttribIFormat": exec_info(core=31),
-    "VertexArrayAttribLFormat": exec_info(core=31),
-    "VertexArrayAttribBinding": exec_info(core=31),
-    "VertexArrayBindingDivisor": exec_info(core=31),
-    "GetVertexArrayiv": exec_info(core=31),
-    "GetVertexArrayIndexediv": exec_info(core=31),
-    "GetVertexArrayIndexed64iv": exec_info(core=31),
-    "CreateSamplers": exec_info(core=31),
-    "CreateProgramPipelines": exec_info(core=31),
-    "CreateQueries": exec_info(core=31),
-    "GetQueryBufferObjectiv": exec_info(core=31),
-    "GetQueryBufferObjectuiv": exec_info(core=31),
-    "GetQueryBufferObjecti64v": exec_info(core=31),
-    "GetQueryBufferObjectui64v": exec_info(core=31),
+    "CreateTransformFeedbacks": exec_info(core=31,compatibility=30),
+    "TransformFeedbackBufferBase": exec_info(core=31,compatibility=30),
+    "TransformFeedbackBufferRange": exec_info(core=31,compatibility=30),
+    "GetTransformFeedbackiv": exec_info(core=31,compatibility=30),
+    "GetTransformFeedbacki_v": exec_info(core=31,compatibility=30),
+    "GetTransformFeedbacki64_v": exec_info(core=31,compatibility=30),
+    "CreateBuffers": exec_info(core=31,compatibility=30),
+    "NamedBufferStorage": exec_info(core=31,compatibility=30),
+    "NamedBufferData": exec_info(core=31,compatibility=30),
+    "NamedBufferSubData": exec_info(core=31,compatibility=30),
+    "CopyNamedBufferSubData": exec_info(core=31,compatibility=30),
+    "ClearNamedBufferData": exec_info(core=31,compatibility=30),
+    "ClearNamedBufferSubData": exec_info(core=31,compatibility=30),
+    "MapNamedBuffer": exec_info(core=31,compatibility=30),
+    "MapNamedBufferRange": exec_info(core=31,compatibility=30),
+    "UnmapNamedBuffer": exec_info(core=31,compatibility=30),
+    "FlushMappedNamedBufferRange": exec_info(core=31,compatibility=30),
+    "GetNamedBufferParameteriv": exec_info(core=31,compatibility=30),
+    "GetNamedBufferParameteri64v": exec_info(core=31,compatibility=30),
+    "GetNamedBufferPointerv": exec_info(core=31,compatibility=30),
+    "GetNamedBufferSubData": exec_info(core=31,compatibility=30),
+    "CreateFramebuffers": exec_info(core=31,compatibility=30),
+    "NamedFramebufferRenderbuffer": exec_info(core=31,compatibility=30),
+    "NamedFramebufferParameteri": exec_info(core=31,compatibility=30),
+    "NamedFramebufferTexture": exec_info(core=31,compatibility=30),
+    "NamedFramebufferTextureLayer": exec_info(core=31,compatibility=30),
+    "NamedFramebufferDrawBuffer": exec_info(core=31,compatibility=30),
+    "NamedFramebufferDrawBuffers": exec_info(core=31,compatibility=30),
+    "NamedFramebufferReadBuffer": exec_info(core=31,compatibility=30),
+    "InvalidateNamedFramebufferData": exec_info(core=31,compatibility=30),
+    "InvalidateNamedFramebufferSubData": exec_info(core=31,compatibility=30),
+    "ClearNamedFramebufferiv": exec_info(core=31,compatibility=30),
+    "ClearNamedFramebufferuiv": exec_info(core=31,compatibility=30),
+    "ClearNamedFramebufferfv": exec_info(core=31,compatibility=30),
+    "ClearNamedFramebufferfi": exec_info(core=31,compatibility=30),
+    "BlitNamedFramebuffer": exec_info(core=31,compatibility=30),
+    "CheckNamedFramebufferStatus": exec_info(core=31,compatibility=30),
+    "GetNamedFramebufferParameteriv": exec_info(core=31,compatibility=30),
+    "GetNamedFramebufferAttachmentParameteriv": exec_info(core=31,compatibility=30),
+    "CreateRenderbuffers": exec_info(core=31,compatibility=30),
+    "NamedRenderbufferStorage": exec_info(core=31,compatibility=30),
+    "NamedRenderbufferStorageMultisample": exec_info(core=31,compatibility=30),
+    "GetNamedRenderbufferParameteriv": exec_info(core=31,compatibility=30),
+    "CreateTextures": exec_info(core=31,compatibility=30),
+    "TextureBuffer": exec_info(core=31,compatibility=30),
+    "TextureBufferRange": exec_info(core=31,compatibility=30),
+    "TextureStorage1D": exec_info(core=31,compatibility=30),
+    "TextureStorage2D": exec_info(core=31,compatibility=30),
+    "TextureStorage3D": exec_info(core=31,compatibility=30),
+    "TextureStorage2DMultisample": exec_info(core=31,compatibility=30),
+    "TextureStorage3DMultisample": exec_info(core=31,compatibility=30),
+    "TextureSubImage1D": exec_info(core=31,compatibility=30),
+    "TextureSubImage2D": exec_info(core=31,compatibility=30),
+    "TextureSubImage3D": exec_info(core=31,compatibility=30),
+    "CompressedTextureSubImage1D": exec_info(core=31,compatibility=30),
+    "CompressedTextureSubImage2D": exec_info(core=31,compatibility=30),
+    "CompressedTextureSubImage3D": exec_info(core=31,compatibility=30),
+    "CopyTextureSubImage1D": exec_info(core=31,compatibility=30),
+    "CopyTextureSubImage2D": exec_info(core=31,compatibility=30),
+    "CopyTextureSubImage3D": exec_info(core=31,compatibility=30),
+    "TextureParameterf": exec_info(core=31,compatibility=30),
+    "TextureParameterfv": exec_info(core=31,compatibility=30),
+    "TextureParameteri": exec_info(core=31,compatibility=30),
+    "TextureParameterIiv": exec_info(core=31,compatibility=30),
+    "TextureParameterIuiv": exec_info(core=31,compatibility=30),
+    "TextureParameteriv": exec_info(core=31,compatibility=30),
+    "GenerateTextureMipmap": exec_info(core=31,compatibility=30),
+    "BindTextureUnit": exec_info(core=31,compatibility=30),
+    "GetTextureImage": exec_info(core=31,compatibility=30),
+    "GetCompressedTextureImage": exec_info(core=31,compatibility=30),
+    "GetTextureLevelParameterfv": exec_info(core=31,compatibility=30),
+    "GetTextureLevelParameteriv": exec_info(core=31,compatibility=30),
+    "GetTextureParameterfv": exec_info(core=31,compatibility=30),
+    "GetTextureParameterIiv": exec_info(core=31,compatibility=30),
+    "GetTextureParameterIuiv": exec_info(core=31,compatibility=30),
+    "GetTextureParameteriv": exec_info(core=31,compatibility=30),
+    "CreateVertexArrays": exec_info(core=31,compatibility=30),
+    "DisableVertexArrayAttrib": exec_info(core=31,compatibility=30),
+    "EnableVertexArrayAttrib": exec_info(core=31,compatibility=30),
+    "VertexArrayElementBuffer": exec_info(core=31,compatibility=30),
+    "VertexArrayVertexBuffer": exec_info(core=31,compatibility=30),
+    "VertexArrayVertexBuffers": exec_info(core=31,compatibility=30),
+    "VertexArrayAttribFormat": exec_info(core=31,compatibility=30),
+    "VertexArrayAttribIFormat": exec_info(core=31,compatibility=30),
+    "VertexArrayAttribLFormat": exec_info(core=31,compatibility=30),
+    "VertexArrayAttribBinding": exec_info(core=31,compatibility=30),
+    "VertexArrayBindingDivisor": exec_info(core=31,compatibility=30),
+    "GetVertexArrayiv": exec_info(core=31,compatibility=30),
+    "GetVertexArrayIndexediv": exec_info(core=31,compatibility=30),
+    "GetVertexArrayIndexed64iv": exec_info(core=31,compatibility=30),
+    "CreateSamplers": exec_info(core=31,compatibility=30),
+    "CreateProgramPipelines": exec_info(core=31,compatibility=30),
+    "CreateQueries": exec_info(core=31,compatibility=30),
+    "GetQueryBufferObjectiv": exec_info(core=31,compatibility=30),
+    "GetQueryBufferObjectuiv": exec_info(core=31,compatibility=30),
+    "GetQueryBufferObjecti64v": exec_info(core=31,compatibility=30),
+    "GetQueryBufferObjectui64v": exec_info(core=31,compatibility=30),
 
     # GL_ARB_gpu_shader_int64 - nominally requires OpenGL 4.0, and Mesa
     # only supports 4.0 in core profile.