diff options
| author | Samuel Pitoiset <[email protected]> | 2017-06-23 17:01:22 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-28 10:25:12 +0200 |
| commit | 886399694021d013908106cdccab66fda275ae75 (patch) | |
| tree | 7eab1a02129a958c3bb4fbfca2d4ef5a2ced8793 /src/mesa | |
| parent | f04a5b4df062b20989805a730ac644fe388eca48 (diff) | |
mesa: add KHR_no_error support for glAttachShader() and glAttachObjectARB()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 15 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.h | 7 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 796e42ddf01..16d9f1e6486 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -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) @@ -1355,6 +1362,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) { GET_CURRENT_CONTEXT(ctx); diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 0a28185177d..3f6c0ff0cba 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -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); |