4 files changed, 105 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml b/src/mapi/glapi/gen/ARB_bindless_texture.xml
new file mode 100644
index 00000000000..e57f897a934
--- /dev/null
+++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_bindless_texture" number="152">
+
+   <enum name="UNSIGNED_INT64_ARB" value="0x140F" />
+   <type name="uint64EXT" unsigned="true" size="8"/>
+
+   <function name="GetTextureHandleARB">
+      <return type="GLuint64"/>
+      <param name="texture" type="GLuint" />
+   </function>
+
+   <function name="GetTextureSamplerHandleARB">
+      <return type="GLuint64"/>
+      <param name="texture" type="GLuint" />
+      <param name="sampler" type="GLuint" />
+   </function>
+
+   <function name="MakeTextureHandleResidentARB">
+      <param name="handle" type="GLuint64" />
+   </function>
+
+   <function name="MakeTextureHandleNonResidentARB">
+      <param name="handle" type="GLuint64" />
+   </function>
+
+   <function name="GetImageHandleARB">
+      <return type="GLuint64"/>
+      <param name="texture" type="GLuint" />
+      <param name="level" type="GLint" />
+      <param name="layered" type="GLboolean" />
+      <param name="layer" type="GLint" />
+      <param name="format" type="GLenum" />
+   </function>
+
+   <function name="MakeImageHandleResidentARB">
+      <param name="handle" type="GLuint64" />
+      <param name="access" type="GLenum" />
+   </function>
+
+   <function name="MakeImageHandleNonResidentARB">
+      <param name="handle" type="GLuint64" />
+   </function>
+
+   <function name="UniformHandleui64ARB">
+      <param name="location" type="GLint" />
+      <param name="value" type="GLuint64" />
+   </function>
+
+   <function name="UniformHandleui64vARB">
+      <param name="location" type="GLint" />
+      <param name="count" type="GLsizei" />
+      <param name="value" type="const GLuint64 *" />
+   </function>
+
+   <function name="ProgramUniformHandleui64ARB">
+      <param name="program" type="GLuint" />
+      <param name="location" type="GLint" />
+      <param name="value" type="GLuint64" />
+   </function>
+
+   <function name="ProgramUniformHandleui64vARB">
+      <param name="program" type="GLuint" />
+      <param name="location" type="GLint" />
+      <param name="count" type="GLsizei" />
+      <param name="value" type="const GLuint64 *" />
+   </function>
+
+   <function name="IsTextureHandleResidentARB">
+      <return type="GLboolean"/>
+      <param name="handle" type="GLuint64" />
+   </function>
+
+   <function name="IsImageHandleResidentARB">
+      <return type="GLboolean"/>
+      <param name="handle" type="GLuint64" />
+   </function>
+
+   <function name="VertexAttribL1ui64ARB" exec="dynamic">
+      <param name="index" type="GLuint" />
+      <param name="x" type="GLuint64EXT" />
+   </function>
+
+   <function name="VertexAttribL1ui64vARB" exec="dynamic">
+      <param name="index" type="GLuint" />
+      <param name="v" type="const GLuint64EXT *" />
+   </function>
+
+   <function name="GetVertexAttribLui64vARB">
+      <param name="index" type="GLuint" />
+      <param name="pname" type="GLenum" />
+      <param name="params" type="GLuint64EXT *" />
+   </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index 33139bdf08f..bd04519f804 100644
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -119,6 +119,7 @@ API_XML = \
 	gl_and_glX_API.xml \
 	ARB_base_instance.xml \
 	ARB_blend_func_extended.xml \
+	ARB_bindless_texture.xml \
 	ARB_clear_buffer_object.xml \
 	ARB_clear_texture.xml \
 	ARB_clip_control.xml \
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 2ee3186b3ed..b7134e21878 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8284,7 +8284,9 @@
     <enum name="QUERY_BUFFER_BARRIER_BIT"           value="0x00008000"/>
 </category>
 
-<!-- ARB extensions 149 - 152 -->
+<!-- ARB extensions 149 - 151 -->
+
+<xi:include href="ARB_bindless_texture.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_compute_variable_group_size.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
diff --git a/src/mapi/glapi/gen/gl_genexec.py b/src/mapi/glapi/gen/gl_genexec.py
index 37b1cc6be0d..57e155bd1fa 100644
--- a/src/mapi/glapi/gen/gl_genexec.py
+++ b/src/mapi/glapi/gen/gl_genexec.py
@@ -113,6 +113,7 @@ header = """/**
 #include "main/texstate.h"
 #include "main/texstorage.h"
 #include "main/barrier.h"
+#include "main/texturebindless.h"
 #include "main/textureview.h"
 #include "main/transformfeedback.h"
 #include "main/mtypes.h"