diff options
| author | Samuel Pitoiset <[email protected]> | 2017-06-26 15:09:04 +0200 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-06-28 10:25:13 +0200 |
| commit | 6a2c1e76f2a51ec19306360c1ee6711487bde5cb (patch) | |
| tree | 6d22afbc724bbf9b370fffd004542e895580e3d2 /src | |
| parent | 277135c1ed5328f8c890c3ea1e25ef4c604a8a09 (diff) | |
mesa: add KHR_no_error support for glUniformBlockBinding()
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mapi/glapi/gen/ARB_uniform_buffer_object.xml | 2 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.h | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml b/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml index cf86bbb2f8a..47bb04725ec 100644 --- a/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml +++ b/src/mapi/glapi/gen/ARB_uniform_buffer_object.xml @@ -86,7 +86,7 @@ <!-- Duplicated with GL3x.xml: BindBufferRange, BindBufferBase, GetIntegeri_v --> -<function name="UniformBlockBinding" es2="3.0"> +<function name="UniformBlockBinding" es2="3.0" no_error="true"> <param name="program" type="GLuint" /> <param name="uniformBlockIndex" type="GLuint" /> <param name="uniformBlockBinding" type="GLuint" /> diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index ef57866d6dc..a71e0695b05 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -1101,6 +1101,16 @@ uniform_block_binding(struct gl_context *ctx, struct gl_shader_program *shProg, } void GLAPIENTRY +_mesa_UniformBlockBinding_no_error(GLuint program, GLuint uniformBlockIndex, + GLuint uniformBlockBinding) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, program); + uniform_block_binding(ctx, shProg, uniformBlockIndex, uniformBlockBinding); +} + +void GLAPIENTRY _mesa_UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding) diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index ebeaf9deb1d..098b5d40c0d 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -232,6 +232,11 @@ _mesa_GetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar * const *uniformNames, GLuint *uniformIndices); + +void GLAPIENTRY +_mesa_UniformBlockBinding_no_error(GLuint program, GLuint uniformBlockIndex, + GLuint uniformBlockBinding); + void GLAPIENTRY _mesa_UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, |