diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/pipelineobj.c | 18 | ||||
| -rw-r--r-- | src/mesa/main/pipelineobj.h | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index b6a4332f605..993fc0a0b17 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -373,6 +373,24 @@ _mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program) use_program_stages(ctx, shProg, stages, pipe); } +void GLAPIENTRY +_mesa_ActiveShaderProgram_no_error(GLuint pipeline, GLuint program) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_shader_program *shProg = NULL; + struct gl_pipeline_object *pipe = _mesa_lookup_pipeline_object(ctx, pipeline); + + if (program) + shProg = _mesa_lookup_shader_program(ctx, program); + + /* Object is created by any Pipeline call but glGenProgramPipelines, + * glIsProgramPipeline and GetProgramPipelineInfoLog + */ + pipe->EverBound = GL_TRUE; + + _mesa_reference_shader_program(ctx, &pipe->ActiveProgram, shProg); +} + /** * Use the named shader program for subsequent glUniform calls (if pipeline * bound) diff --git a/src/mesa/main/pipelineobj.h b/src/mesa/main/pipelineobj.h index 048a4c7bf39..54aa40959ed 100644 --- a/src/mesa/main/pipelineobj.h +++ b/src/mesa/main/pipelineobj.h @@ -77,6 +77,8 @@ _mesa_UseProgramStages_no_error(GLuint pipeline, GLbitfield stages, extern void GLAPIENTRY _mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program); +void GLAPIENTRY +_mesa_ActiveShaderProgram_no_error(GLuint pipeline, GLuint program); extern void GLAPIENTRY _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program); |