fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: add ARB_shading_language_include stubs

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Witold Baryluk <witold.baryluk@gmail.com>
This commit is contained in:
Timothy Arceri 2019-08-05 15:40:44 +10:00
parent 4eb2a1dc6f
commit 906f1a2933
6 changed files with 115 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/mapi/glapi/gen/ARB_shading_language_include.xml Normal file
View file

@ -0,0 +1,42 @@
<?xml version="1.0"?>
<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
<OpenGLAPI>
<category name="GL_ARB_shading_language_include" number="76">
<function name="NamedStringARB">
<param name="type" type="GLenum" />
<param name="namelen" type="GLint" />
<param name="name" type="const GLchar *" />
<param name="stringlen" type="GLint" />
<param name="string" type="const GLchar *" />
</function>
<function name="DeleteNamedStringARB">
<param name="namelen" type="GLint" />
<param name="name" type="const GLchar *" />
</function>
<function name="CompileShaderIncludeARB">
<param name="shader" type="GLuint" />
<param name="count" type="GLsizei" />
<param name="path" type="const GLchar * const *" />
<param name="length" type="const GLint *" />
</function>
<function name="IsNamedStringARB">
<param name="namelen" type="GLint" />
<param name="name" type="const GLchar *" />
<return type="GLboolean"/>
</function>
<function name="GetNamedStringARB">
<param name="namelen" type="GLint" />
<param name="name" type="const GLchar *" />
<param name="bufSize" type="GLsizei" />
<param name="stringlen" type="GLint *" />
<param name="string" type="GLchar *" />
</function>
<function name="GetNamedStringivARB">
<param name="namelen" type="GLint" />
<param name="name" type="const GLchar *" />
<param name="pname" type="GLenum" />
<param name="params" type="GLint *" />
</function>
</category>
</OpenGLAPI>

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

@ -8059,7 +8059,8 @@
<!-- ARB extension number 74 is a WGL extension. -->
<!-- ARB extension number 75 is a GLX extension. -->
<!-- 76. GL_ARB_shading_language_include -->
<xi:include href="ARB_shading_language_include.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 77. GL_ARB_texture_compression_bptc -->
<xi:include href="ARB_blend_func_extended.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>

6
src/mapi/glapi/gen/static_data.py
View file

@ -1632,6 +1632,12 @@ offsets = {
"VertexArrayVertexAttribBindingEXT": 1596,
"VertexArrayVertexBindingDivisorEXT": 1597,
"NamedBufferPageCommitmentEXT": 1598,
"NamedStringARB": 1599,
"DeleteNamedStringARB": 1600,
"CompileShaderIncludeARB": 1601,
"IsNamedStringARB": 1602,
"GetNamedStringARB": 1603,
"GetNamedStringivARB": 1604,
}
functions = [

35
src/mesa/main/shaderapi.c
View file

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

22
src/mesa/main/shaderapi.h
View file

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

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

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