Commit 244cef16 authored by Timothy Arceri's avatar Timothy Arceri
Browse files

mesa: add KHR_no_error support for glBindProgramPipeline()


Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
parent 0bca4784
......@@ -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">
......
......@@ -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
*/
......
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment