summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/pipelineobj.c
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-05-03 15:34:52 +1000
committerTimothy Arceri <[email protected]>2017-05-11 10:56:08 +1000
commit244cef1694fbeb6738b883afc2ca6c4cc9c05ff0 (patch)
tree0a9e51e5d897aa34736001df1ead7b98eb718396 /src/mesa/main/pipelineobj.c
parent0bca4784c29e5b12f995eae52a90214de6249771 (diff)
mesa: add KHR_no_error support for glBindProgramPipeline()
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main/pipelineobj.c')
-rw-r--r--src/mesa/main/pipelineobj.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index 993fc0a0b17..f7c911f2e44 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
*/