From e937fd779fc8435750eb5168d2320d06ac259805 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Mon, 4 Jan 2016 09:55:52 +0200 Subject: [PATCH] mesa: do not validate io of non-compute and compute stage MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes regression on SSO tests that have both non-compute and compute programs in a program pipeline. Signed-off-by: Tapani Pälli Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93532 Reviewed-by: Marta Lofstedt --- src/mesa/main/shader_query.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 014977b28ca..a18b860022d 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -1500,6 +1500,13 @@ _mesa_validate_pipeline_io(struct gl_pipeline_object *pipeline) for (idx = prev + 1; idx < ARRAY_SIZE(pipeline->CurrentProgram); idx++) { if (shProg[idx]) { + /* Pipeline might include both non-compute and a compute program, do + * not attempt to validate varyings between non-compute and compute + * stage. + */ + if (shProg[idx]->_LinkedShaders[idx]->Stage == MESA_SHADER_COMPUTE) + break; + if (!validate_io(shProg[prev]->_LinkedShaders[prev], shProg[idx]->_LinkedShaders[idx], shProg[prev]->IsES || shProg[idx]->IsES)) -- 2.30.2