diff options
author | Laura Ekstrand <[email protected]> | 2014-12-05 15:30:21 -0800 |
---|---|---|
committer | Laura Ekstrand <[email protected]> | 2015-01-08 11:37:28 -0800 |
commit | 56875181c75da2c537410313fac917b75c13dfd0 (patch) | |
tree | 6514b0d036c06401b6762d6997ae17bab40a1104 | |
parent | 6c9b695a9c212f332132230e3632c8532ebafedf (diff) |
glapi: Added ARB_direct_state_access.xml file.
main: Added ARB_direct_state_access to extensions.c as dummy_false.
Reviewed-by: Anuj Phogat <[email protected]>
-rw-r--r-- | src/mapi/glapi/gen/ARB_direct_state_access.xml | 11 | ||||
-rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
-rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 6 | ||||
-rw-r--r-- | src/mesa/main/extensions.c | 1 |
4 files changed, 18 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml new file mode 100644 index 00000000000..fcec6080647 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> +<category name="GL_ARB_direct_state_access" number="164"> + <enum name="TEXTURE_TARGET" value="0x1006"/> + <enum name="QUERY_TARGET" value="0x82EA"/> + <enum name="TEXTURE_BINDING" value="0x82EB"/> + +</category> +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index e56b46e3dca..35d9d011f46 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -121,6 +121,7 @@ API_XML = \ ARB_debug_output.xml \ ARB_depth_buffer_float.xml \ ARB_depth_clamp.xml \ + ARB_direct_state_access.xml \ ARB_draw_buffers.xml \ ARB_draw_buffers_blend.xml \ ARB_draw_elements_base_vertex.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e1b12462e34..2d6bed20638 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8375,7 +8375,11 @@ <enum name="QUERY_BY_REGION_NO_WAIT_INVERTED" value="0x8E1A"/> </category> -<!-- ARB extensions 162 - 166 --> +<!-- ARB extensions 162 - 163 --> + +<xi:include href="ARB_direct_state_access.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + +<!-- ARB extensions 165 - 166 --> <xi:include href="ARB_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 0df04c2e698..4fa9d1a26b1 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -104,6 +104,7 @@ static const struct extension extension_table[] = { { "GL_ARB_depth_clamp", o(ARB_depth_clamp), GL, 2003 }, { "GL_ARB_depth_texture", o(ARB_depth_texture), GLL, 2001 }, { "GL_ARB_derivative_control", o(ARB_derivative_control), GL, 2014 }, + { "GL_ARB_direct_state_access", o(dummy_false), GL, 2014 }, { "GL_ARB_draw_buffers", o(dummy_true), GL, 2002 }, { "GL_ARB_draw_buffers_blend", o(ARB_draw_buffers_blend), GL, 2009 }, { "GL_ARB_draw_elements_base_vertex", o(ARB_draw_elements_base_vertex), GL, 2009 }, |