From: Alejandro Piñeiro <apinhe...@igalia.com> v2: * Mention extension gap at gl_API.xml (Emil Velikov) * Bail with INVALID_ENUM if extension not available on getStringi (Emil Velikov) * Use EXTRA_EXT macro when defining the extension at get.c/get_hash_params.py (Emil Velikov) * Rename source files (spirvextensions.[ch] -> spirv_extensions.[ch]) (Ian)
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> --- src/mapi/glapi/gen/ARB_spirv_extensions.xml | 13 ++++++++ src/mapi/glapi/gen/Makefile.am | 1 + src/mapi/glapi/gen/gl_API.xml | 4 +++ src/mapi/glapi/gen/meson.build | 1 + src/mesa/Makefile.sources | 2 ++ src/mesa/main/extensions_table.h | 1 + src/mesa/main/get.c | 7 +++++ src/mesa/main/get_hash_params.py | 3 ++ src/mesa/main/getstring.c | 12 +++++++ src/mesa/main/mtypes.h | 1 + src/mesa/main/spirv_extensions.c | 42 +++++++++++++++++++++++++ src/mesa/main/spirv_extensions.h | 49 +++++++++++++++++++++++++++++ src/mesa/meson.build | 2 ++ 13 files changed, 138 insertions(+) create mode 100644 src/mapi/glapi/gen/ARB_spirv_extensions.xml create mode 100644 src/mesa/main/spirv_extensions.c create mode 100644 src/mesa/main/spirv_extensions.h diff --git a/src/mapi/glapi/gen/ARB_spirv_extensions.xml b/src/mapi/glapi/gen/ARB_spirv_extensions.xml new file mode 100644 index 00000000000..103393104c2 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_spirv_extensions.xml @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_ARB_spirv_extensions" number="194"> + + <enum name="SPIR_V_EXTENSIONS" value="0x9553"/> + <enum name="NUM_SPIR_V_EXTENSIONS" value="0x9554"/> + +</category> + +</OpenGLAPI> diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am index 35e37e95a9f..9a7a268adbf 100644 --- a/src/mapi/glapi/gen/Makefile.am +++ b/src/mapi/glapi/gen/Makefile.am @@ -167,6 +167,7 @@ API_XML = \ ARB_shader_subroutine.xml \ ARB_shader_storage_buffer_object.xml \ ARB_sparse_buffer.xml \ + ARB_spirv_extensions.xml \ ARB_sync.xml \ ARB_tessellation_shader.xml \ ARB_texture_barrier.xml \ diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index d3594cfe195..00cf83eca03 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8404,6 +8404,10 @@ <xi:include href="ARB_gl_spirv.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<!-- ARB extensions 191 - 193 --> + +<xi:include href="ARB_spirv_extensions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <!-- Non-ARB extensions sorted by extension number. --> <category name="GL_EXT_blend_color" number="2"> diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index a6a93cc83be..bfc766f7944 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -75,6 +75,7 @@ api_xml_files = files( 'ARB_shader_subroutine.xml', 'ARB_shader_storage_buffer_object.xml', 'ARB_sparse_buffer.xml', + 'ARB_spirv_extensions.xml', 'ARB_sync.xml', 'ARB_tessellation_shader.xml', 'ARB_texture_barrier.xml', diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index e9680bf004c..a897d72f226 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -203,6 +203,8 @@ MAIN_FILES = \ main/shader_query.cpp \ main/shared.c \ main/shared.h \ + main/spirv_extensions.c \ + main/spirv_extensions.h \ main/state.c \ main/state.h \ main/stencil.c \ diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index ab15ceb9414..06deabd0640 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -129,6 +129,7 @@ EXT(ARB_shading_language_420pack , ARB_shading_language_420pack EXT(ARB_shading_language_packing , ARB_shading_language_packing , GLL, GLC, x , x , 2011) EXT(ARB_shadow , ARB_shadow , GLL, x , x , x , 2001) EXT(ARB_sparse_buffer , ARB_sparse_buffer , GLL, GLC, x , x , 2014) +EXT(ARB_spirv_extensions , ARB_spirv_extensions , x, GLC, x , x , 2016) EXT(ARB_stencil_texturing , ARB_stencil_texturing , GLL, GLC, x , x , 2012) EXT(ARB_sync , ARB_sync , GLL, GLC, x , x , 2003) EXT(ARB_tessellation_shader , ARB_tessellation_shader , x , GLC, x , x , 2009) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index ea8d932b182..2440f47558d 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -34,6 +34,7 @@ #include "get.h" #include "macros.h" #include "mtypes.h" +#include "spirv_extensions.h" #include "state.h" #include "texcompress.h" #include "texstate.h" @@ -501,6 +502,7 @@ EXTRA_EXT(OES_primitive_bounding_box); EXTRA_EXT(ARB_compute_variable_group_size); EXTRA_EXT(KHR_robustness); EXTRA_EXT(ARB_sparse_buffer); +EXTRA_EXT(ARB_spirv_extensions); static const int extra_ARB_color_buffer_float_or_glcore[] = { @@ -1151,6 +1153,11 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu } } break; + + /* ARB_spirv_extensions */ + case GL_NUM_SPIR_V_EXTENSIONS: + v->value_int = _mesa_get_spirv_extension_count(ctx); + break; } } diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 20ef6e4977a..e2e803fba02 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -378,6 +378,9 @@ descriptor=[ # GL_ARB_sampler_objects / GL 3.3 / GLES 3.0 [ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA" ], +# GL_ARB_spirv_extensions + [ "NUM_SPIR_V_EXTENSIONS", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_spirv_extensions" ], + # GL_ARB_sync [ "MAX_SERVER_WAIT_TIMEOUT", "CONTEXT_INT64(Const.MaxServerWaitTimeout), extra_ARB_sync" ], diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 931f6a476cb..23828aaf1b5 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -32,6 +32,7 @@ #include "extensions.h" #include "mtypes.h" #include "macros.h" +#include "spirv_extensions.h" /** * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query. @@ -186,6 +187,17 @@ _mesa_GetStringi(GLenum name, GLuint index) return (const GLubyte *) 0; } return _mesa_get_enabled_extension(ctx, index); + case GL_SPIR_V_EXTENSIONS: + if (!ctx->Extensions.ARB_spirv_extensions) { + _mesa_error(ctx, GL_INVALID_ENUM, "glGetStringi"); + return (const GLubyte *) 0; + } + + if (index >= _mesa_get_spirv_extension_count(ctx)) { + _mesa_error(ctx, GL_INVALID_VALUE, "glGetStringi(index=%u)", index); + return (const GLubyte *) 0; + } + return _mesa_get_enabled_spirv_extension(ctx, index); default: _mesa_error(ctx, GL_INVALID_ENUM, "glGetStringi"); return (const GLubyte *) 0; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 7fed85a2ae6..c63a5a67582 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4120,6 +4120,7 @@ struct gl_extensions GLboolean ARB_shadow; GLboolean ARB_sparse_buffer; GLboolean ARB_stencil_texturing; + GLboolean ARB_spirv_extensions; GLboolean ARB_sync; GLboolean ARB_tessellation_shader; GLboolean ARB_texture_border_clamp; diff --git a/src/mesa/main/spirv_extensions.c b/src/mesa/main/spirv_extensions.c new file mode 100644 index 00000000000..40a89c133aa --- /dev/null +++ b/src/mesa/main/spirv_extensions.c @@ -0,0 +1,42 @@ +/* + * Copyright © 2017 Intel Corporation + * + * 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 + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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. + */ + +/** + * \file + * \brief SPIRV-V extension handling. See ARB_spirv_extensions + */ + +#include "spirv_extensions.h" + +GLuint +_mesa_get_spirv_extension_count(struct gl_context *ctx) +{ + return 0; +} + +const GLubyte * +_mesa_get_enabled_spirv_extension(struct gl_context *ctx, + GLuint index) +{ + return (const GLubyte *) 0; +} diff --git a/src/mesa/main/spirv_extensions.h b/src/mesa/main/spirv_extensions.h new file mode 100644 index 00000000000..35754f7e53b --- /dev/null +++ b/src/mesa/main/spirv_extensions.h @@ -0,0 +1,49 @@ +/* + * Copyright 2017 Intel Corporation + * + * 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 + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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. + */ + +/** + * \file + * \brief SPIRV-V extension handling. See ARB_spirv_extensions + */ + +#ifndef _SPIRVEXTENSIONS_H_ +#define _SPIRVEXTENSIONS_H_ + +#include "mtypes.h" + +#ifdef __cplusplus +extern "C" { +#endif + +extern GLuint +_mesa_get_spirv_extension_count(struct gl_context *ctx); + +extern const GLubyte * +_mesa_get_enabled_spirv_extension(struct gl_context *ctx, + GLuint index); + +#ifdef __cplusplus +} +#endif + +#endif /* SPIRVEXTENSIONS_H */ diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 2eec7d45f7d..3d8548eb107 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -245,6 +245,8 @@ files_libmesa_common = files( 'main/shader_query.cpp', 'main/shared.c', 'main/shared.h', + 'main/spirv_extensions.c', + 'main/spirv_extensions.h', 'main/state.c', 'main/state.h', 'main/stencil.c', -- 2.15.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev