From 906f1a293312ecca60b6187b08a11afffe432796 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Mon, 5 Aug 2019 15:40:44 +1000 Subject: mesa: add ARB_shading_language_include stubs Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Witold Baryluk --- .../glapi/gen/ARB_shading_language_include.xml | 42 ++++++++++++++++++++++ src/mapi/glapi/gen/gl_API.xml | 3 +- src/mapi/glapi/gen/static_data.py | 6 ++++ src/mesa/main/shaderapi.c | 35 ++++++++++++++++++ src/mesa/main/shaderapi.h | 22 ++++++++++++ src/mesa/main/tests/dispatch_sanity.cpp | 14 ++++---- 6 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 src/mapi/glapi/gen/ARB_shading_language_include.xml (limited to 'src') diff --git a/src/mapi/glapi/gen/ARB_shading_language_include.xml b/src/mapi/glapi/gen/ARB_shading_language_include.xml new file mode 100644 index 00000000000..c305a7e2294 --- /dev/null +++ b/src/mapi/glapi/gen/ARB_shading_language_include.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index a804e850f46..dff4e9560bc 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8059,7 +8059,8 @@ - + + diff --git a/src/mapi/glapi/gen/static_data.py b/src/mapi/glapi/gen/static_data.py index 176df719a23..22bdf003544 100644 --- a/src/mapi/glapi/gen/static_data.py +++ b/src/mapi/glapi/gen/static_data.py @@ -1632,6 +1632,12 @@ offsets = { "VertexArrayVertexAttribBindingEXT": 1596, "VertexArrayVertexBindingDivisorEXT": 1597, "NamedBufferPageCommitmentEXT": 1598, + "NamedStringARB": 1599, + "DeleteNamedStringARB": 1600, + "CompileShaderIncludeARB": 1601, + "IsNamedStringARB": 1602, + "GetNamedStringARB": 1603, + "GetNamedStringivARB": 1604, } functions = [ diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 8bca17a9352..7781609bc57 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -3138,6 +3138,41 @@ _mesa_GetProgramStageiv(GLuint program, GLenum shadertype, } } +GLvoid GLAPIENTRY +_mesa_NamedStringARB(GLenum type, GLint namelen, const GLchar *name, + GLint stringlen, const GLchar *string) +{ +} + +GLvoid GLAPIENTRY +_mesa_DeleteNamedStringARB(GLint namelen, const GLchar *name) +{ +} + +GLvoid GLAPIENTRY +_mesa_CompileShaderIncludeARB(GLuint shader, GLsizei count, + const GLchar* const *path, const GLint *length) +{ +} + +GLboolean GLAPIENTRY +_mesa_IsNamedStringARB(GLint namelen, const GLchar *name) +{ + return false; +} + +GLvoid GLAPIENTRY +_mesa_GetNamedStringARB(GLint namelen, const GLchar *name, GLsizei bufSize, + GLint *stringlen, GLchar *string) +{ +} + +GLvoid GLAPIENTRY +_mesa_GetNamedStringivARB(GLint namelen, const GLchar *name, + GLenum pname, GLint *params) +{ +} + static int find_compat_subroutine(struct gl_program *p, const struct glsl_type *type) { diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 73fa90bbae9..81318ca932b 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -381,6 +381,28 @@ extern GLvoid GLAPIENTRY _mesa_GetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values); +extern GLvoid GLAPIENTRY +_mesa_NamedStringARB(GLenum type, GLint namelen, const GLchar *name, + GLint stringlen, const GLchar *string); + +extern GLvoid GLAPIENTRY +_mesa_DeleteNamedStringARB(GLint namelen, const GLchar *name); + +extern GLvoid GLAPIENTRY +_mesa_CompileShaderIncludeARB(GLuint shader, GLsizei count, + const GLchar* const *path, const GLint *length); + +extern GLboolean GLAPIENTRY +_mesa_IsNamedStringARB(GLint namelen, const GLchar *name); + +extern GLvoid GLAPIENTRY +_mesa_GetNamedStringARB(GLint namelen, const GLchar *name, GLsizei bufSize, + GLint *stringlen, GLchar *string); + +extern GLvoid GLAPIENTRY +_mesa_GetNamedStringivARB(GLint namelen, const GLchar *name, + GLenum pname, GLint *params); + GLcharARB * _mesa_read_shader_source(const gl_shader_stage stage, const char *source); diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 8b892c6fec2..61201ee39b9 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -675,12 +675,6 @@ const struct function common_desktop_functions_possible[] = { { "glBlendFunciARB", 43, -1 }, { "glBlendFuncSeparateiARB", 43, -1 }, { "glMinSampleShadingARB", 43, -1 }, // XXX: Add to xml -// { "glNamedStringARB", 43, -1 }, // XXX: Add to xml -// { "glDeleteNamedStringARB", 43, -1 }, // XXX: Add to xml -// { "glCompileShaderIncludeARB", 43, -1 }, // XXX: Add to xml -// { "glIsNamedStringARB", 43, -1 }, // XXX: Add to xml -// { "glGetNamedStringARB", 43, -1 }, // XXX: Add to xml -// { "glGetNamedStringivARB", 43, -1 }, // XXX: Add to xml { "glBindFragDataLocationIndexed", 43, -1 }, { "glGetFragDataIndex", 43, -1 }, { "glGenSamplers", 43, -1 }, @@ -1208,6 +1202,14 @@ const struct function common_desktop_functions_possible[] = { { "glBindImageTextures", 44, -1 }, { "glBindVertexBuffers", 44, -1 }, + /* GL_ARB_shading_language_include */ + { "glNamedStringARB", 20, -1 }, + { "glDeleteNamedStringARB", 20, -1 }, + { "glCompileShaderIncludeARB", 20, -1 }, + { "glIsNamedStringARB", 20, -1 }, + { "glGetNamedStringARB", 20, -1 }, + { "glGetNamedStringivARB", 20, -1 }, + /* GL_KHR_debug/GL_ARB_debug_output */ { "glPushDebugGroup", 11, -1 }, { "glPopDebugGroup", 11, -1 }, -- cgit v1.2.3