diff options
| -rw-r--r-- | src/mapi/glapi/gen/ARB_shader_image_load_store.xml | 89 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/Makefile.am | 1 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 4 |
4 files changed, 94 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/ARB_shader_image_load_store.xml b/src/mapi/glapi/gen/ARB_shader_image_load_store.xml new file mode 100644 index 00000000000..7ccfca41d81 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_shader_image_load_store.xml @@ -0,0 +1,89 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_shader_image_load_store" number="115"> + +<enum name="VERTEX_ATTRIB_ARRAY_BARRIER_BIT" value="0x00000001"/> +<enum name="ELEMENT_ARRAY_BARRIER_BIT" value="0x00000002"/> +<enum name="UNIFORM_BARRIER_BIT" value="0x00000004"/> +<enum name="TEXTURE_FETCH_BARRIER_BIT" value="0x00000008"/> +<enum name="SHADER_IMAGE_ACCESS_BARRIER_BIT" value="0x00000020"/> +<enum name="COMMAND_BARRIER_BIT" value="0x00000040"/> +<enum name="PIXEL_BUFFER_BARRIER_BIT" value="0x00000080"/> +<enum name="TEXTURE_UPDATE_BARRIER_BIT" value="0x00000100"/> +<enum name="BUFFER_UPDATE_BARRIER_BIT" value="0x00000200"/> +<enum name="FRAMEBUFFER_BARRIER_BIT" value="0x00000400"/> +<enum name="TRANSFORM_FEEDBACK_BARRIER_BIT" value="0x00000800"/> +<enum name="ATOMIC_COUNTER_BARRIER_BIT" value="0x00001000"/> +<enum name="ALL_BARRIER_BITS" value="0xFFFFFFFF"/> +<enum name="MAX_IMAGE_UNITS" value="0x8F38"/> +<enum name="MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS" value="0x8F39"/> +<enum name="IMAGE_BINDING_NAME" value="0x8F3A"/> +<enum name="IMAGE_BINDING_LEVEL" value="0x8F3B"/> +<enum name="IMAGE_BINDING_LAYERED" value="0x8F3C"/> +<enum name="IMAGE_BINDING_LAYER" value="0x8F3D"/> +<enum name="IMAGE_BINDING_ACCESS" value="0x8F3E"/> +<enum name="IMAGE_1D" value="0x904C"/> +<enum name="IMAGE_2D" value="0x904D"/> +<enum name="IMAGE_3D" value="0x904E"/> +<enum name="IMAGE_2D_RECT" value="0x904F"/> +<enum name="IMAGE_CUBE" value="0x9050"/> +<enum name="IMAGE_BUFFER" value="0x9051"/> +<enum name="IMAGE_1D_ARRAY" value="0x9052"/> +<enum name="IMAGE_2D_ARRAY" value="0x9053"/> +<enum name="IMAGE_CUBE_MAP_ARRAY" value="0x9054"/> +<enum name="IMAGE_2D_MULTISAMPLE" value="0x9055"/> +<enum name="IMAGE_2D_MULTISAMPLE_ARRAY" value="0x9056"/> +<enum name="INT_IMAGE_1D" value="0x9057"/> +<enum name="INT_IMAGE_2D" value="0x9058"/> +<enum name="INT_IMAGE_3D" value="0x9059"/> +<enum name="INT_IMAGE_2D_RECT" value="0x905A"/> +<enum name="INT_IMAGE_CUBE" value="0x905B"/> +<enum name="INT_IMAGE_BUFFER" value="0x905C"/> +<enum name="INT_IMAGE_1D_ARRAY" value="0x905D"/> +<enum name="INT_IMAGE_2D_ARRAY" value="0x905E"/> +<enum name="INT_IMAGE_CUBE_MAP_ARRAY" value="0x905F"/> +<enum name="INT_IMAGE_2D_MULTISAMPLE" value="0x9060"/> +<enum name="INT_IMAGE_2D_MULTISAMPLE_ARRAY" value="0x9061"/> +<enum name="UNSIGNED_INT_IMAGE_1D" value="0x9062"/> +<enum name="UNSIGNED_INT_IMAGE_2D" value="0x9063"/> +<enum name="UNSIGNED_INT_IMAGE_3D" value="0x9064"/> +<enum name="UNSIGNED_INT_IMAGE_2D_RECT" value="0x9065"/> +<enum name="UNSIGNED_INT_IMAGE_CUBE" value="0x9066"/> +<enum name="UNSIGNED_INT_IMAGE_BUFFER" value="0x9067"/> +<enum name="UNSIGNED_INT_IMAGE_1D_ARRAY" value="0x9068"/> +<enum name="UNSIGNED_INT_IMAGE_2D_ARRAY" value="0x9069"/> +<enum name="UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY" value="0x906A"/> +<enum name="UNSIGNED_INT_IMAGE_2D_MULTISAMPLE" value="0x906B"/> +<enum name="UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY" value="0x906C"/> +<enum name="MAX_IMAGE_SAMPLES" value="0x906D"/> +<enum name="IMAGE_BINDING_FORMAT" value="0x906E"/> +<enum name="IMAGE_FORMAT_COMPATIBILITY_TYPE" value="0x90C7"/> +<enum name="IMAGE_FORMAT_COMPATIBILITY_BY_SIZE" value="0x90C8"/> +<enum name="IMAGE_FORMAT_COMPATIBILITY_BY_CLASS" value="0x90C9"/> +<enum name="MAX_VERTEX_IMAGE_UNIFORMS" value="0x90CA"/> +<enum name="MAX_TESS_CONTROL_IMAGE_UNIFORMS" value="0x90CB"/> +<enum name="MAX_TESS_EVALUATION_IMAGE_UNIFORMS" value="0x90CC"/> +<enum name="MAX_GEOMETRY_IMAGE_UNIFORMS" value="0x90CD"/> +<enum name="MAX_FRAGMENT_IMAGE_UNIFORMS" value="0x90CE"/> +<enum name="MAX_COMBINED_IMAGE_UNIFORMS" value="0x90CF"/> + +<function name="BindImageTexture" offset="assign"> + <param name="unit" type="GLuint"/> + <param name="texture" type="GLuint"/> + <param name="level" type="GLint"/> + <param name="layered" type="GLboolean"/> + <param name="layer" type="GLint"/> + <param name="access" type="GLenum"/> + <param name="format" type="GLenum"/> +</function> + +<function name="MemoryBarrier" offset="assign"> + <param name="barriers" type="GLbitfield"/> +</function> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 65bd9137c53..d5c20b71e2e 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -113,6 +113,7 @@ API_XML = \ ARB_sampler_objects.xml \ ARB_seamless_cube_map.xml \ ARB_shader_atomic_counters.xml \ + ARB_shader_image_load_store.xml \ ARB_sync.xml \ ARB_texture_buffer_object.xml \ ARB_texture_buffer_range.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 697b2ecce28..ff65b489a08 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8312,6 +8312,8 @@ <xi:include href="ARB_shader_atomic_counters.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="ARB_shader_image_load_store.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 extension #118 --> diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 227a4fd8b89..b9719569f08 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -828,8 +828,8 @@ const struct function gl_core_functions_possible[] = { { "glDrawTransformFeedbackStreamInstanced", 43, -1 }, // { "glGetInternalformativ", 43, -1 }, // XXX: Add to xml { "glGetActiveAtomicCounterBufferiv", 43, -1 }, -// { "glBindImageTexture", 43, -1 }, // XXX: Add to xml -// { "glMemoryBarrier", 43, -1 }, // XXX: Add to xml + { "glBindImageTexture", 43, -1 }, + { "glMemoryBarrier", 43, -1 }, { "glTexStorage1D", 43, -1 }, { "glTexStorage2D", 43, -1 }, { "glTexStorage3D", 43, -1 }, |