On Sat, 04 May 2013 12:37:05 -0700
Kenneth Graunke <kenn...@whitecape.org> wrote:
> On 05/03/2013 10:44 AM, Gregory Hainaut wrote:
> > V2:
> > * Rename object
> > * Formatting improvement
> > ---
> > src/mesa/main/pipelineobj.c | 77
> > +++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 77 insertions(+)
> >
> > diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
> > index d81bd0e..ffbeeae 100644
> > --- a/src/mesa/main/pipelineobj.c
> > +++ b/src/mesa/main/pipelineobj.c
> > @@ -231,6 +231,30 @@ _mesa_UseProgramStages(GLuint pipeline, GLbitfield
> > stages, GLuint program)
> > void GLAPIENTRY
> > _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program)
> > {
> > + GET_CURRENT_CONTEXT(ctx);
> > + struct gl_shader_program *shProg = (program != 0)
> > + ? _mesa_lookup_shader_program_err(ctx, program,
> > "glActiveShaderProgram(program)")
> > + : NULL;
> > +
> > + struct gl_pipeline_object *pipe = lookup_pipeline_object(ctx, pipeline);
> > +
> > + if (!pipe) {
> > + _mesa_error(ctx, GL_INVALID_OPERATION,
> > "glActiveShaderProgram(pipeline)");
> > + return;
> > + }
> > +
> > + /* Object is created by any Pipeline call but glGenProgramPipelines,
> > + * glIsProgramPipeline and GetProgramPipelineInfoLog
> > + */
> > + pipe->EverBound = GL_TRUE;
>
> This doesn't seem right to me. I found this section of the spec:
>
> """
> A program pipeline object is created by binding a name returned by
> GenProgramPipelines with the command
>
> void BindProgramPipeline(uint pipeline);
>
> <pipeline> is the program pipeline object name. The resulting program
> pipeline object is a new state vector, comprising ACTIVE_PROGRAM,
> VERTEX_SHADER, GEOMETRY_SHADER, FRAGMENT_SHADER, TESS_CONTROL_SHADER,
> and TESS_EVALUATION_SHADER.
> """
>
> It sure sounds to me like BindProgramPipeline is the only thing that
> should set EverBound. Is there another part of the spec that I missed
> which suggests otherwise?
>
You mean http://www.opengl.org/registry/specs/ARB/separate_shader_objects.txt ?
Or an older glspec?
Don't know which one is the reference but here an extract (duplicated 4 times)
of glspec43.core.20130214.pdf:
Page 104-105 (void UseProgramStages)
Page 105-106 (void ActiveShaderProgram)
Page 144 (void GetProgramPipelineiv)
Page 339 (void ValidateProgramPipeline)
"""
If pipeline is a name that has been generated (without subsequent deletion) by
GenProgramPipelines, but refers to a program pipeline object that has not been
previously bound, the GL first creates a new state vector in the same manner as
when BindProgramPipeline creates a new program pipeline object.
"""
> > +
> > + if ((shProg != NULL) && !shProg->LinkStatus) {
> > + _mesa_error(ctx, GL_INVALID_OPERATION,
> > + "glActiveShaderProgram(program %u not linked)", shProg->Name);
> > + return;
> > + }
> > +
> > + _mesa_reference_shader_program(ctx, &pipe->ActiveProgram, shProg);
> > }
> >
> > /**
> > @@ -348,6 +372,59 @@ _mesa_IsProgramPipeline(GLuint pipeline)
> > void GLAPIENTRY
> > _mesa_GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
> > {
> > + GET_CURRENT_CONTEXT(ctx);
> > + struct gl_pipeline_object *pipe = lookup_pipeline_object(ctx, pipeline);
> > +
> > + /* Are geometry shaders available in this context?
> > + */
> > + const bool has_gs = _mesa_is_desktop_gl(ctx) &&
> > ctx->Extensions.ARB_geometry_shader4;
> > +
> > + if (!pipe) {
> > + _mesa_error(ctx, GL_INVALID_OPERATION,
> > "glGetProgramPipelineiv(pipeline)");
> > + return;
> > + }
> > +
> > + /* Object is created by any Pipeline call but glGenProgramPipelines,
> > + * glIsProgramPipeline and GetProgramPipelineInfoLog
> > + */
> > + pipe->EverBound = GL_TRUE;
> > +
> > + switch (pname) {
> > + case GL_ACTIVE_PROGRAM:
> > + *params = pipe->ActiveProgram ? pipe->ActiveProgram->Name : 0;
> > + return;
> > + case GL_INFO_LOG_LENGTH:
> > + // TODO
> > + *params = 0;
> > + return;
> > + case GL_VALIDATE_STATUS:
> > + *params = pipe->ValidationStatus;
> > + return;
> > + case GL_VERTEX_SHADER:
> > + *params = pipe->CurrentVertexProgram ?
> > pipe->CurrentVertexProgram->Name : 0;
> > + return;
> > + case GL_TESS_EVALUATION_SHADER:
> > + /* NOT YET SUPPORTED */
> > + break;
> > + case GL_TESS_CONTROL_SHADER:
> > + /* NOT YET SUPPORTED */
> > + break;
> > + case GL_GEOMETRY_SHADER:
> > + if (!has_gs) break;
> > + *params = pipe->CurrentGeometryProgram ?
> > pipe->CurrentGeometryProgram->Name : 0;;
> > + return;
> > + case GL_FRAGMENT_SHADER:
> > + *params = pipe->CurrentFragmentProgram ?
> > pipe->CurrentFragmentProgram->Name : 0;;
> > + return;
> > + case GL_COMPUTE_SHADER:
> > + /* NOT YET SUPPORTED */
> > + break;
> > + default:
> > + break;
> > + }
> > +
> > + _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramPipelineiv(pname=%s)",
> > + _mesa_lookup_enum_by_nr(pname));
> > }
> >
> > /**
> >
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
