KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: add KHR_no_error support for glAttachShader() and glAttachObjectARB() 

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Samuel Pitoiset 2017-06-23 17:01:22 +02:00
parent f04a5b4df0
commit 8863996940
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5295,7 +5295,7 @@
<glx ignore="true"/>
</function>
<function name="AttachShader" es2="2.0">
<function name="AttachShader" es2="2.0" no_error="true">
<param name="program" type="GLuint"/>
<param name="shader" type="GLuint"/>
<glx ignore="true"/>
@ -7709,7 +7709,7 @@
<glx ignore="true"/>
</function>
<function name="AttachObjectARB">
<function name="AttachObjectARB" no_error="true">
<param name="containerObj" type="GLhandleARB"/>
<param name="obj" type="GLhandleARB"/>
<glx ignore="true"/>

15
src/mesa/main/shaderapi.c
View File

@ -1345,6 +1345,13 @@ validate_program(struct gl_context *ctx, GLuint program)
}
void GLAPIENTRY
_mesa_AttachObjectARB_no_error(GLhandleARB program, GLhandleARB shader)
{
GET_CURRENT_CONTEXT(ctx);
attach_shader_no_error(ctx, program, shader);
}
void GLAPIENTRY
_mesa_AttachObjectARB(GLhandleARB program, GLhandleARB shader)
@ -1354,6 +1361,14 @@ _mesa_AttachObjectARB(GLhandleARB program, GLhandleARB shader)
}
void GLAPIENTRY
_mesa_AttachShader_no_error(GLuint program, GLuint shader)
{
GET_CURRENT_CONTEXT(ctx);
attach_shader_no_error(ctx, program, shader);
}
void GLAPIENTRY
_mesa_AttachShader(GLuint program, GLuint shader)
{

7
src/mesa/main/shaderapi.h
View File

@ -73,6 +73,10 @@ _mesa_longest_attribute_name_length(struct gl_shader_program *shProg);
extern void
_mesa_shader_write_subroutine_indices(struct gl_context *ctx,
gl_shader_stage stage);
void GLAPIENTRY
_mesa_AttachObjectARB_no_error(GLhandleARB, GLhandleARB);
extern void GLAPIENTRY
_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
@ -154,7 +158,8 @@ _mesa_GetActiveAttrib(GLuint, GLuint, GLsizei, GLsizei *, GLint *,
extern GLint GLAPIENTRY
_mesa_GetAttribLocation(GLuint, const GLchar *);
void GLAPIENTRY
_mesa_AttachShader_no_error(GLuint program, GLuint shader);
extern void GLAPIENTRY
_mesa_AttachShader(GLuint program, GLuint shader);