diff options
| author | Tapani Pälli <[email protected]> | 2016-01-04 09:55:52 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2016-01-13 07:31:57 +0200 |
| commit | e937fd779fc8435750eb5168d2320d06ac259805 (patch) | |
| tree | 5f0e129b3890b02b056350e76728056eeeaa5444 /src/mesa | |
| parent | 6b0706b2aab5ec56f13357e9957fbf99a63839f8 (diff) | |
mesa: do not validate io of non-compute and compute stage
Fixes regression on SSO tests that have both non-compute and
compute programs in a program pipeline.
Signed-off-by: Tapani Pälli <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93532
Reviewed-by: Marta Lofstedt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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)) |