aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-11 08:00:45 +0100
committermarha <marha@users.sourceforge.net>2013-01-11 08:00:45 +0100
commitddc05759f098f06bd93253a7bffe38640963dfb3 (patch)
treefd0ae943233033cda2bfe50dd097532a4cf5c0b9 /mesalib/src/mapi/glapi/gen
parent8a26872f0c9102cb357345eca24a4bf7401bbe70 (diff)
downloadvcxsrv-ddc05759f098f06bd93253a7bffe38640963dfb3.tar.gz
vcxsrv-ddc05759f098f06bd93253a7bffe38640963dfb3.tar.bz2
vcxsrv-ddc05759f098f06bd93253a7bffe38640963dfb3.zip
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
fontconfig: 0831c1770e4bac7269a190936bbb0529d747e233 libX11: 0b148750027fd0557c5ed93afda861ddf4b92e0f mkfontscale: 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2 xserver: 6703a7c7cf1a349c137e247a0c8eb462ff7b07be mesa: babab2876080af0fe65249dff559244aebd0b87e
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
-rw-r--r--mesalib/src/mapi/glapi/gen/.gitignore1
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml23
-rw-r--r--mesalib/src/mapi/glapi/gen/GL3x.xml2
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile.am12
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_API.xml14
5 files changed, 43 insertions, 9 deletions
diff --git a/mesalib/src/mapi/glapi/gen/.gitignore b/mesalib/src/mapi/glapi/gen/.gitignore
deleted file mode 100644
index 5fc607b9e..000000000
--- a/mesalib/src/mapi/glapi/gen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile
diff --git a/mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml b/mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml
new file mode 100644
index 000000000..3944bc7d8
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_ES3_compatibility.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_ES3_compatibility" number="127">
+ <enum name="COMPRESSED_RGB8_ETC2" value="0x9274"/>
+ <enum name="COMPRESSED_SRGB8_ETC2" value="0x9275"/>
+ <enum name="COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2" value="0x9276"/>
+ <enum name="COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2" value="0x9277"/>
+ <enum name="COMPRESSED_RGBA8_ETC2_EAC" value="0x9278"/>
+ <enum name="COMPRESSED_SRGB8_ALPHA8_ETC2_EAC" value="0x9279"/>
+ <enum name="COMPRESSED_R11_EAC" value="0x9270"/>
+ <enum name="COMPRESSED_SIGNED_R11_EAC" value="0x9271"/>
+ <enum name="COMPRESSED_RG11_EAC" value="0x9272"/>
+ <enum name="COMPRESSED_SIGNED_RG11_EAC" value="0x9273"/>
+ <enum name="PRIMITIVE_RESTART_FIXED_INDEX" value="0x8D69"/>
+ <enum name="ANY_SAMPLES_PASSED_CONSERVATIVE" value="0x8D6A"/>
+ <enum name="MAX_ELEMENT_INDEX" value="0x8D6B"/>
+ <enum name="TEXTURE_IMMUTABLE_LEVELS" value="0x82DF"/>
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index 1b7adddfa..c17a64402 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -595,7 +595,7 @@
<enum name="MAX_FRAGMENT_INPUT_COMPONENTS" value="0x9125"/>
<enum name="CONTEXT_PROFILE_MASK" value="0x9126"/>
- <function name="GetInteger64i_v" offset="assign" es2="3.0" exec="skip">
+ <function name="GetInteger64i_v" offset="assign" es2="3.0">
<param name="cap" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="data" type="GLint64 *"/>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 13943e839..ff22c8e0d 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -51,7 +51,7 @@ if HAVE_SPARC_ASM
MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_sparc.S
endif
-MESA_OUTPUTS = \
+BUILT_SOURCES = \
$(MESA_GLAPI_OUTPUTS) \
$(MESA_GLAPI_ASM_OUTPUTS) \
$(MESA_DIR)/main/enums.c \
@@ -63,6 +63,11 @@ MESA_OUTPUTS = \
$(MESA_GLX_DIR)/indirect_init.c \
$(MESA_GLX_DIR)/indirect_size.h \
$(MESA_GLX_DIR)/indirect_size.c
+EXTRA_DIST= \
+ $(BUILT_SOURCES) \
+ $(MESA_GLAPI_DIR)/glapi_x86.S \
+ $(MESA_GLAPI_DIR)/glapi_x86-64.S \
+ $(MESA_GLAPI_DIR)/glapi_sparc.S
######################################################################
@@ -101,6 +106,7 @@ API_XML = \
ARB_draw_elements_base_vertex.xml \
ARB_draw_instanced.xml \
ARB_ES2_compatibility.xml \
+ ARB_ES3_compatibility.xml \
ARB_framebuffer_object.xml \
ARB_geometry_shader4.xml \
ARB_instanced_arrays.xml \
@@ -144,6 +150,7 @@ COMMON = $(API_XML) \
gl_and_es_API.xml \
es_EXT.xml \
ARB_ES2_compatibility.xml \
+ ARB_ES3_compatibility.xml \
ARB_get_program_binary.xml \
OES_fixed_point.xml \
OES_single_precision.xml
@@ -154,8 +161,6 @@ PYTHON_GEN = $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS)
######################################################################
-all-local: $(MESA_OUTPUTS)
-
xorg: check-xorg-source $(XORG_OUTPUTS)
check-xorg-source:
@@ -169,7 +174,6 @@ check-xorg-source:
clean-local:
-rm -f *~ *.pyo
- -rm -f $(MESA_OUTPUTS)
######################################################################
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index a47316a83..8a8a1ee03 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8277,7 +8277,11 @@
<xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<!-- ARB extensions #106...#108 -->
+<!-- ARB extensions #106 -->
+
+<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #108 -->
<category name="GL_ARB_transform_feedback_instanced" number="109">
<function name="DrawTransformFeedbackInstanced" offset="assign"
@@ -8304,10 +8308,14 @@
<!-- ARB extensions #114...#116 -->
-<xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-
<xi:include href="ARB_texture_storage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<!-- ARB extensions #118...#126 -->
+
+<xi:include href="ARB_ES3_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<!-- ARB extensions #128...#131 -->
+
<xi:include href="ARB_invalidate_subdata.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- Non-ARB extensions sorted by extension number. -->