From 6a2c1e76f2a51ec19306360c1ee6711487bde5cb Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 26 Jun 2017 15:09:04 +0200 Subject: [PATCH] mesa: add KHR_no_error support for glUniformBlockBinding() Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mapi/glapi/gen/ARB_uniform_buffer_object.xml | 2 +- src/mesa/main/uniforms.c | 10 ++++++++++ src/mesa/main/uniforms.h | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) 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 @@ - + 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 @@ -1100,6 +1100,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, 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, -- 2.30.2