Module: Mesa Branch: master Commit: 244cef1694fbeb6738b883afc2ca6c4cc9c05ff0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=244cef1694fbeb6738b883afc2ca6c4cc9c05ff0
Author: Timothy Arceri <[email protected]> Date: Wed May 3 15:34:52 2017 +1000 mesa: add KHR_no_error support for glBindProgramPipeline() Reviewed-by: Eric Anholt <[email protected]> --- src/mapi/glapi/gen/ARB_separate_shader_objects.xml | 2 +- src/mesa/main/pipelineobj.c | 26 ++++++++++++++++++++++ src/mesa/main/pipelineobj.h | 2 ++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml index c3385e9370..54c1be3fe7 100644 --- a/src/mapi/glapi/gen/ARB_separate_shader_objects.xml +++ b/src/mapi/glapi/gen/ARB_separate_shader_objects.xml @@ -30,7 +30,7 @@ <param name="strings" type="const GLchar * const *" /> <return type="GLuint"/> </function> - <function name="BindProgramPipeline" es2="3.1"> + <function name="BindProgramPipeline" es2="3.1" no_error="true"> <param name="pipeline" type="GLuint" /> </function> <function name="DeleteProgramPipelines" es2="3.1"> diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 993fc0a0b1..f7c911f2e4 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -431,6 +431,32 @@ _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program) _mesa_reference_shader_program(ctx, &pipe->ActiveProgram, shProg); } +void GLAPIENTRY +_mesa_BindProgramPipeline_no_error(GLuint pipeline) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_pipeline_object *newObj = NULL; + + /* Rebinding the same pipeline object: no change. + */ + if (ctx->_Shader->Name == pipeline) + return; + + /* Get pointer to new pipeline object (newObj) + */ + if (pipeline) { + /* non-default pipeline object */ + newObj = _mesa_lookup_pipeline_object(ctx, pipeline); + + /* Object is created by any Pipeline call but glGenProgramPipelines, + * glIsProgramPipeline and GetProgramPipelineInfoLog + */ + newObj->EverBound = GL_TRUE; + } + + _mesa_bind_pipeline(ctx, newObj); +} + /** * Make program of the pipeline current */ diff --git a/src/mesa/main/pipelineobj.h b/src/mesa/main/pipelineobj.h index 54aa40959e..1bf6b71316 100644 --- a/src/mesa/main/pipelineobj.h +++ b/src/mesa/main/pipelineobj.h @@ -82,6 +82,8 @@ _mesa_ActiveShaderProgram_no_error(GLuint pipeline, GLuint program); extern void GLAPIENTRY _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program); +void GLAPIENTRY +_mesa_BindProgramPipeline_no_error(GLuint pipeline); extern void GLAPIENTRY _mesa_BindProgramPipeline(GLuint pipeline); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
