diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2015-11-24 11:50:22 +1100 |
|---|---|---|
| committer | Timothy Arceri <t_arceri@yahoo.com.au> | 2015-11-24 20:59:44 +1100 |
| commit | 3c4aa7aff2a976e94c2b6b7bf273edd617080ca3 (patch) | |
| tree | ea1456660e3d763b72300db44eecc1b5ff850561 /src/mesa/main/pipelineobj.c | |
| parent | d09463193608009fa42e046b1fc144435d3533f6 (diff) | |
| download | external_mesa3d-3c4aa7aff2a976e94c2b6b7bf273edd617080ca3.zip external_mesa3d-3c4aa7aff2a976e94c2b6b7bf273edd617080ca3.tar.gz external_mesa3d-3c4aa7aff2a976e94c2b6b7bf273edd617080ca3.tar.bz2 | |
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 <ian.d.romanick@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Cc: "11.1" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/main/pipelineobj.c')
| -rw-r--r-- | src/mesa/main/pipelineobj.c | 3 |
1 files changed, 1 insertions, 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] |