[Mesa-dev] [PATCH 1/2] Revert "mesa: return initial value for VALIDATE_STATUS if pipe not bound"

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 11/24/2015 03:08 AM, Timothy Arceri wrote:
> From: Timothy Arceri <timothy.arceri at collabora.com>
>
> This reverts commit ba02f7a3b6a0e4314753a8e5080db61241563f9c.
>
> The commit checked whether the pipeline was currently bound instead
> of checking whether it had ever been bound.  The previous setting
> of Validated during object creation makes this unnecessary.  The
> real problem was that Validated was not properly set to false
> elsewhere in the code.  This is fixed by a later patch.
>
> Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
> Cc: Tapani Pälli <tapani.palli at intel.com>
> Cc: "11.1" <mesa-stable at lists.freedesktop.org>
> ---
>   src/mesa/main/pipelineobj.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
> index 90dff13..f079c50 100644
> --- a/src/mesa/main/pipelineobj.c
> +++ b/src/mesa/main/pipelineobj.c
> @@ -645,8 +645,7 @@ _mesa_GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
>         *params = pipe->InfoLog ? strlen(pipe->InfoLog) + 1 : 0;
>         return;
>      case GL_VALIDATE_STATUS:
> -      /* If pipeline is not bound, return initial value 0. */
> -      *params = (ctx->_Shader->Name != pipe->Name) ? 0 : pipe->Validated;
> +      *params = pipe->Validated;
>         return;
>      case GL_VERTEX_SHADER:
>         *params = pipe->CurrentProgram[MESA_SHADER_VERTEX]