On Wednesday, 2017-11-15 14:22:04 +0100, Eduardo Lima Mitev wrote: > From: Nicolai Hähnle <nicolai.haeh...@amd.com> > > --- > src/mapi/glapi/gen/ARB_gl_spirv.xml | 21 ++++++++++++++ > src/mapi/glapi/gen/Makefile.am | 1 + > src/mapi/glapi/gen/gl_API.xml | 4 +++ > src/mapi/glapi/gen/gl_genexec.py | 1 + > src/mesa/Makefile.sources | 2 ++ > src/mesa/main/extensions_table.h | 1 + > src/mesa/main/glspirv.c | 33 +++++++++++++++++++++ > src/mesa/main/glspirv.h | 51 > +++++++++++++++++++++++++++++++++ > src/mesa/main/mtypes.h | 1 + > src/mesa/main/tests/dispatch_sanity.cpp | 3 ++ > 10 files changed, 118 insertions(+) > create mode 100644 src/mapi/glapi/gen/ARB_gl_spirv.xml > create mode 100644 src/mesa/main/glspirv.c > create mode 100644 src/mesa/main/glspirv.h > > diff --git a/src/mapi/glapi/gen/ARB_gl_spirv.xml > b/src/mapi/glapi/gen/ARB_gl_spirv.xml > new file mode 100644 > index 00000000000..0dd615480f7 > --- /dev/null > +++ b/src/mapi/glapi/gen/ARB_gl_spirv.xml > @@ -0,0 +1,21 @@ > +<?xml version="1.0"?> > +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> > + > +<OpenGLAPI> > + > +<category name="GL_ARB_gl_spirv" number="190"> > + > + <enum name="SHADER_BINARY_FORMAT_SPIR_V_ARB" value="0x9551"/> > + <enum name="SPIR_V_BINARY_ARB" value="0x9552"/> > + > + <function name="SpecializeShaderARB"> > + <param name="shader" type="GLuint"/> > + <param name="pEntryPoint" type="const GLchar *"/> > + <param name="numSpecializationConstants" type="GLuint"/> > + <param name="pConstantIndex" type="const GLuint *"/> > + <param name="pConstantValue" type="const GLuint *"/> > + </function> > + > +</category> > + > +</OpenGLAPI> > diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am > index 87d8517b7ba..35e37e95a9f 100644 > --- a/src/mapi/glapi/gen/Makefile.am > +++ b/src/mapi/glapi/gen/Makefile.am > @@ -144,6 +144,7 @@ API_XML = \ > ARB_framebuffer_object.xml \ > ARB_get_program_binary.xml \ > ARB_get_texture_sub_image.xml \ > + ARB_gl_spirv.xml \ > ARB_gpu_shader_fp64.xml \ > ARB_gpu_shader_int64.xml \ > ARB_gpu_shader5.xml \
For this and the other autotools hunk further down, please add to this patch: ----8<---- diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 69ef57bc1460e8f92411..ddd0e856e3e5f8e89b01 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -52,6 +52,7 @@ api_xml_files = files( 'ARB_framebuffer_object.xml', 'ARB_get_program_binary.xml', 'ARB_get_texture_sub_image.xml', + 'ARB_gl_spirv.xml', 'ARB_gpu_shader_fp64.xml', 'ARB_gpu_shader_int64.xml', 'ARB_gpu_shader5.xml', diff --git a/src/mesa/meson.build b/src/mesa/meson.build index b839fd0298189263d632..32135446999b5812a984 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -162,6 +162,8 @@ files_libmesa_common = files( 'main/getstring.c', 'main/glformats.c', 'main/glformats.h', + 'main/glspirv.c', + 'main/glspirv.h', 'main/glthread.c', 'main/glthread.h', 'main/glheader.h', ---->8---- > diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml > index eb1d9b83b27..d3594cfe195 100644 > --- a/src/mapi/glapi/gen/gl_API.xml > +++ b/src/mapi/glapi/gen/gl_API.xml > @@ -8400,6 +8400,10 @@ > > <xi:include href="ARB_gpu_shader_int64.xml" > xmlns:xi="http://www.w3.org/2001/XInclude"/> > > +<!-- ARB extension 179 - 189 --> > + > +<xi:include href="ARB_gl_spirv.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/gl_genexec.py > b/src/mapi/glapi/gen/gl_genexec.py > index b7b22328ff8..aaff9f230b3 100644 > --- a/src/mapi/glapi/gen/gl_genexec.py > +++ b/src/mapi/glapi/gen/gl_genexec.py > @@ -77,6 +77,7 @@ header = """/** > #include "main/eval.h" > #include "main/externalobjects.h" > #include "main/get.h" > +#include "main/glspirv.h" > #include "main/feedback.h" > #include "main/fog.h" > #include "main/fbobject.h" > diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources > index 6da1e3fef9d..e9680bf004c 100644 > --- a/src/mesa/Makefile.sources > +++ b/src/mesa/Makefile.sources > @@ -118,6 +118,8 @@ MAIN_FILES = \ > main/getstring.c \ > main/glformats.c \ > main/glformats.h \ > + main/glspirv.c \ > + main/glspirv.h \ > main/glthread.c \ > main/glthread.h \ > main/glheader.h \ > diff --git a/src/mesa/main/extensions_table.h > b/src/mesa/main/extensions_table.h > index 5b66e7d30df..ab15ceb9414 100644 > --- a/src/mesa/main/extensions_table.h > +++ b/src/mesa/main/extensions_table.h > @@ -72,6 +72,7 @@ EXT(ARB_framebuffer_object , > ARB_framebuffer_object > EXT(ARB_framebuffer_sRGB , EXT_framebuffer_sRGB > , GLL, GLC, x , x , 1998) > EXT(ARB_get_program_binary , dummy_true > , GLL, GLC, x , x , 2010) > EXT(ARB_get_texture_sub_image , dummy_true > , GLL, GLC, x , x , 2014) > +EXT(ARB_gl_spirv , ARB_gl_spirv > , x, GLC, x , x , 2016) > EXT(ARB_gpu_shader5 , ARB_gpu_shader5 > , x , GLC, x , x , 2010) > EXT(ARB_gpu_shader_fp64 , ARB_gpu_shader_fp64 > , x , GLC, x , x , 2010) > EXT(ARB_gpu_shader_int64 , ARB_gpu_shader_int64 > , x , GLC, x , x , 2015) > diff --git a/src/mesa/main/glspirv.c b/src/mesa/main/glspirv.c > new file mode 100644 > index 00000000000..57068023091 > --- /dev/null > +++ b/src/mesa/main/glspirv.c > @@ -0,0 +1,33 @@ > +/* > + * Copyright 2017 Advanced Micro Devices, Inc. > + * > + * 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. > + */ > + > +#include "glspirv.h" > + > +void GLAPIENTRY > +_mesa_SpecializeShaderARB(GLuint shader, > + const GLchar *pEntryPoint, > + GLuint numSpecializationConstants, > + const GLuint *pConstantIndex, > + const GLuint *pConstantValue) > +{ > +} > diff --git a/src/mesa/main/glspirv.h b/src/mesa/main/glspirv.h > new file mode 100644 > index 00000000000..1de88717faa > --- /dev/null > +++ b/src/mesa/main/glspirv.h > @@ -0,0 +1,51 @@ > +/* > + * Copyright 2017 Advanced Micro Devices, Inc. > + * > + * 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. > + */ > + > +#ifndef GLSPIRV_H > +#define GLSPIRV_H > + > +#include "mtypes.h" > + > +#ifdef __cplusplus > +extern "C" { > +#endif > + > +/** > + * \name API functions > + */ > +/*@{*/ > + > +void GLAPIENTRY > +_mesa_SpecializeShaderARB(GLuint shader, > + const GLchar *pEntryPoint, > + GLuint numSpecializationConstants, > + const GLuint *pConstantIndex, > + const GLuint *pConstantValue); > + > +/*@}*/ > + > +#ifdef __cplusplus > +} > +#endif > + > +#endif /* GLSPIRV_H */ > diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h > index 6b5c5bbb366..1c953b83155 100644 > --- a/src/mesa/main/mtypes.h > +++ b/src/mesa/main/mtypes.h > @@ -4054,6 +4054,7 @@ struct gl_extensions > GLboolean ARB_enhanced_layouts; > GLboolean ARB_explicit_attrib_location; > GLboolean ARB_explicit_uniform_location; > + GLboolean ARB_gl_spirv; > GLboolean ARB_gpu_shader5; > GLboolean ARB_gpu_shader_fp64; > GLboolean ARB_gpu_shader_int64; > diff --git a/src/mesa/main/tests/dispatch_sanity.cpp > b/src/mesa/main/tests/dispatch_sanity.cpp > index d7183de0f1a..94675bf8ced 100644 > --- a/src/mesa/main/tests/dispatch_sanity.cpp > +++ b/src/mesa/main/tests/dispatch_sanity.cpp > @@ -1962,6 +1962,9 @@ const struct function gl_core_functions_possible[] = { > { "glProgramUniform3ui64vARB", 45, -1 }, > { "glProgramUniform4ui64vARB", 45, -1 }, > > + /* GL_ARB_gl_spirv */ > + { "glSpecializeShaderARB", 45, -1 }, > + > { NULL, 0, -1 } > }; > > -- > 2.11.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
