fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 11:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: add GL_ARB_gl_spirv boilerplate

Browse source 
v2: * Add meson build bits (Eric Engestrom)
    * Return INVALID_OPERATION error on SpecializeShaderARB (Ian Romanick)

v3: Include boilerplate for the GL 4.6 alias of glSpecializeShaderARB
   (Neil Roberts)

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Nicolai Hähnle 2017-06-10 19:39:02 +02:00 • committed by Eduardo Lima Mitev
parent df657ebb68
commit 46b21b8f90
13 changed files with 138 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mapi/glapi/gen/ARB_gl_spirv.xml Normal file
View file

@ -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>

11
src/mapi/glapi/gen/GL4x.xml
View file

@ -73,6 +73,17 @@
<param name="clamp" type="GLfloat"/>
</function>
<enum name="POLYGON_OFFSET_CLAMP" value="0x8E1B"/>
<enum name="SHADER_BINARY_FORMAT_SPIR_V" value="0x9551"/>
<enum name="SPIR_V_BINARY" value="0x9552"/>
<function name="SpecializeShader" alias="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>

1
src/mapi/glapi/gen/Makefile.am
View file

@ -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 \

4
src/mapi/glapi/gen/gl_API.xml
View file

@ -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">

1
src/mapi/glapi/gen/gl_genexec.py
View file

@ -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"

1
src/mapi/glapi/gen/meson.build
View file

@ -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',

2
src/mesa/Makefile.sources
View file

@ -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 \

1
src/mesa/main/extensions_table.h
View file

@ -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)

39
src/mesa/main/glspirv.c Normal file
View file

@ -0,0 +1,39 @@
/*
* 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"
#include "errors.h"
void GLAPIENTRY
_mesa_SpecializeShaderARB(GLuint shader,
const GLchar *pEntryPoint,
GLuint numSpecializationConstants,
const GLuint *pConstantIndex,
const GLuint *pConstantValue)
{
GET_CURRENT_CONTEXT(ctx);
/* Just return GL_INVALID_OPERATION error while this is boilerplate */
_mesa_error(ctx, GL_INVALID_OPERATION, "SpecializeShaderARB");
}

51
src/mesa/main/glspirv.h Normal file
View file

@ -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 */

1
src/mesa/main/mtypes.h
View file

@ -4074,6 +4074,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;

3
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -1963,6 +1963,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
src/mesa/meson.build
View file

@ -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',