diff options
author | Marek Olšák <marek.olsak@amd.com> | 2021-01-30 23:22:10 -0500 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-02-15 19:29:09 +0000 |
commit | d45043d3b859b73f56c2379f3bba3bda29e8108d (patch) | |
tree | 2b9d6976d5b46af1775c4ec90912aca62391b5a0 /src/mesa/main/uniform_query.cpp | |
parent | b6e84f56f71d2877f909f1814f57fbe743a6f58a (diff) |
mesa: don't report 1 for GL_VALIDATE_STATUS if user didn't validate pipeline
dEQP expects GL_VALIDATE_STATUS to be set to 0 if the user didn't call
glValidateProgramPipeline even if the pipeline is valid, but we will
validate pipeline objects in state changes, not draw calls.
This will fix a failure in this test caused by the next commit:
dEQP-GLES31.functional.state_query.program_pipeline.validate_status_get_program_pipelineiv
Reviewed-by: Zoltán Böszörményi <zboszor@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8798>
Diffstat (limited to 'src/mesa/main/uniform_query.cpp')
-rw-r--r-- | src/mesa/main/uniform_query.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index 82ebe7dad02..9d368ce27bb 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -1013,7 +1013,7 @@ validate_uniform(GLint location, GLsizei count, const GLvoid *values, /* We need to reset the validate flag on changes to samplers in case * two different sampler types are set to the same texture unit. */ - ctx->_Shader->Validated = GL_FALSE; + ctx->_Shader->Validated = ctx->_Shader->UserValidated = GL_FALSE; } if (uni->type->is_image()) { |