diff options
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/Makefile.am | 64 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/Makefile.sources | 22 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml | 13 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/Makefile.am | 1 | ||||
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_API.xml | 13 |
5 files changed, 38 insertions, 75 deletions
diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am deleted file mode 100644 index cadcd69d6..000000000 --- a/mesalib/src/mapi/glapi/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright © 2012 Jon TURNEY -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -SUBDIRS = . tests - -TOP = $(top_srcdir) -include Makefile.sources -include ../Makefile.sources - -AM_CPPFLAGS = \ - $(DEFINES) \ - $(SELINUX_CFLAGS) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -I$(top_builddir)/src/mapi \ - -I$(top_srcdir)/src/mesa - -if HAVE_X86_ASM -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) -endif - -if HAVE_SHARED_GLAPI -AM_CPPFLAGS += \ - -DMAPI_MODE_BRIDGE \ - -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\" -glapi_GLAPI_sources = $(GLAPI_UTIL_SOURCES) -glapi_ASM_sources = -glapi_MAPI_sources = $(MAPI_BRIDGE_FILES) -else -AM_CPPFLAGS += \ - -DMAPI_MODE_UTIL -glapi_GLAPI_sources = $(GLAPI_SOURCES) $(GLAPI_UTIL_SOURCES) -glapi_ASM_sources = $(GLAPI_ASM_SOURCES) -glapi_MAPI_sources = $(MAPI_UTIL_FILES) -endif - -noinst_LTLIBRARIES = libglapi.la - -libglapi_la_SOURCES = $(glapi_GLAPI_sources) $(glapi_ASM_sources) $(glapi_MAPI_sources) diff --git a/mesalib/src/mapi/glapi/Makefile.sources b/mesalib/src/mapi/glapi/Makefile.sources index aae41a88d..df149a7d8 100644 --- a/mesalib/src/mapi/glapi/Makefile.sources +++ b/mesalib/src/mapi/glapi/Makefile.sources @@ -1,22 +1,22 @@ # src/mapi/glapi/Makefile.sources GLAPI_UTIL_SOURCES = \ - glapi_gentable.c + $(top_builddir)/src/mapi/glapi/glapi_gentable.c GLAPI_SOURCES = \ - glapi_dispatch.c \ - glapi_entrypoint.c \ - glapi_getproc.c \ - glapi_nop.c \ - glapi.c \ - glapi.h \ - glapi_priv.h + $(top_srcdir)/src/mapi/glapi/glapi_dispatch.c \ + $(top_srcdir)/src/mapi/glapi/glapi_entrypoint.c \ + $(top_srcdir)/src/mapi/glapi/glapi_getproc.c \ + $(top_srcdir)/src/mapi/glapi/glapi_nop.c \ + $(top_srcdir)/src/mapi/glapi/glapi.c \ + $(top_srcdir)/src/mapi/glapi/glapi.h \ + $(top_srcdir)/src/mapi/glapi/glapi_priv.h X86_API = \ - glapi_x86.S + $(top_builddir)/src/mapi/glapi/glapi_x86.S X86_64_API = \ - glapi_x86-64.S + $(top_builddir)/src/mapi/glapi/glapi_x86-64.S SPARC_API = \ - glapi_sparc.S + $(top_builddir)/src/mapi/glapi/glapi_sparc.S diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml new file mode 100644 index 000000000..7119732c8 --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_barrier.xml @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<!-- Note: no GLX protocol info yet. --> + + +<OpenGLAPI> + +<category name="GL_ARB_texture_barrier" number="167"> + <function name="TextureBarrier" alias="TextureBarrierNV" /> +</category> + +</OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 645def4ef..2fbc59806 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -145,6 +145,7 @@ API_XML = \ ARB_shader_atomic_counters.xml \ ARB_shader_image_load_store.xml \ ARB_sync.xml \ + ARB_texture_barrier.xml \ ARB_texture_buffer_object.xml \ ARB_texture_buffer_range.xml \ ARB_texture_compression_rgtc.xml \ diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 4dd0707f6..16a2a0893 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8364,6 +8364,19 @@ <xi:include href="ARB_multi_bind.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extensions 148 - 160 --> + +<category name="GL_ARB_conditional_render_inverted" number="161"> + <enum name="QUERY_WAIT_INVERTED" value="0x8E17"/> + <enum name="QUERY_NO_WAIT_INVERTED" value="0x8E18"/> + <enum name="QUERY_BY_REGION_WAIT_INVERTED" value="0x8E19"/> + <enum name="QUERY_BY_REGION_NO_WAIT_INVERTED" value="0x8E1A"/> +</category> + +<!-- ARB extensions 162 - 166 --> + +<xi:include href="ARB_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <!-- Non-ARB extensions sorted by extension number. --> <category name="GL_EXT_blend_color" number="2"> |