Module: Mesa Branch: master Commit: 3c4aa7aff2a976e94c2b6b7bf273edd617080ca3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c4aa7aff2a976e94c2b6b7bf273edd617080ca3
Author: Timothy Arceri <[email protected]> Date: Tue Nov 24 11:50:22 2015 +1100 Revert "mesa: return initial value for VALIDATE_STATUS if pipe not bound" 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 <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Cc: "11.1" <[email protected]> --- 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] _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
