aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/glapi/Makefile.am5
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml58
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile.am7
-rwxr-xr-xmesalib/src/mapi/glapi/gen/gl_API.xml6
4 files changed, 70 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am
index 05c67a6d4..bf653a305 100644
--- a/mesalib/src/mapi/glapi/Makefile.am
+++ b/mesalib/src/mapi/glapi/Makefile.am
@@ -33,10 +33,11 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa
if HAVE_X86_ASM
-GLAPI_ASM_SOURCES = $(X86_API)
-endif
if HAVE_X86_64_ASM
GLAPI_ASM_SOURCES = $(X86_64_API)
+else
+GLAPI_ASM_SOURCES = $(X86_API)
+endif
endif
if HAVE_SPARC_ASM
GLAPI_ASM_SOURCES = $(SPARC_API)
diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
new file mode 100644
index 000000000..0ee6a3c00
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+<OpenGLAPI>
+
+<category name="GL_ARB_vertex_attrib_binding" number="125">
+
+ <function name="BindVertexBuffer" offset="assign">
+ <param name="bindingindex" type="GLuint"/>
+ <param name="buffer" type="GLuint"/>
+ <param name="offset" type="GLintptr"/>
+ <param name="stride" type="GLsizei"/>
+ </function>
+
+ <function name="VertexAttribFormat" offset="assign">
+ <param name="attribindex" type="GLuint"/>
+ <param name="size" type="GLint"/>
+ <param name="type" type="GLenum"/>
+ <param name="normalized" type="GLboolean"/>
+ <param name="relativeoffset" type="GLuint"/>
+ </function>
+
+ <function name="VertexAttribIFormat" offset="assign">
+ <param name="attribindex" type="GLuint"/>
+ <param name="size" type="GLint"/>
+ <param name="type" type="GLenum"/>
+ <param name="relativeoffset" type="GLuint"/>
+ </function>
+
+ <function name="VertexAttribLFormat" offset="assign">
+ <param name="attribindex" type="GLuint"/>
+ <param name="size" type="GLint"/>
+ <param name="type" type="GLenum"/>
+ <param name="relativeoffset" type="GLuint"/>
+ </function>
+
+ <function name="VertexAttribBinding" offset="assign">
+ <param name="attribindex" type="GLuint"/>
+ <param name="bindingindex" type="GLuint"/>
+ </function>
+
+ <function name="VertexBindingDivisor" offset="assign">
+ <param name="attribindex" type="GLuint"/>
+ <param name="divisor" type="GLuint"/>
+ </function>
+
+ <enum name="VERTEX_ATTRIB_BINDING" value="0x82D4"/>
+ <enum name="VERTEX_ATTRIB_RELATIVE_OFFSET" value="0x82D5"/>
+ <enum name="VERTEX_BINDING_DIVISOR" value="0x82D6"/>
+ <enum name="VERTEX_BINDING_OFFSET" value="0x82D7"/>
+ <enum name="VERTEX_BINDING_STRIDE" value="0x82D8"/>
+ <enum name="MAX_VERTEX_ATTRIB_RELATIVE_OFFSET" value="0x82D9"/>
+ <enum name="MAX_VERTEX_ATTRIB_BINDINGS" value="0x82DA"/>
+
+</category>
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index cbbf659dd..476d943dd 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -32,11 +32,11 @@ MESA_GLAPI_OUTPUTS = \
MESA_GLAPI_ASM_OUTPUTS =
if HAVE_X86_ASM
-MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S
-endif
-
if HAVE_X86_64_ASM
MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86-64.S
+else
+MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S
+endif
endif
if HAVE_SPARC_ASM
@@ -125,6 +125,7 @@ API_XML = \
ARB_texture_storage_multisample.xml \
ARB_texture_storage.xml \
ARB_vertex_array_object.xml \
+ ARB_vertex_attrib_binding.xml \
AMD_draw_buffers_blend.xml \
AMD_performance_monitor.xml \
ARB_vertex_type_2_10_10_10_rev.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 97d67244c..45536793f 100755
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8458,7 +8458,11 @@
</category>
-<!-- ARB extensions #120...#126 -->
+<!-- ARB extensions #120...#124 -->
+
+<xi:include href="ARB_vertex_attrib_binding.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extension #126 -->
<xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>