[Mesa-dev] [PATCH] mesa: do not validate io of non-compute and compute stage

[Lofstedt, Marta]

Reviewed-by: Marta Lofstedt <marta.lofstedt at intel.com>


> -----Original Message-----
> From: mesa-dev [mailto:mesa-dev-bounces at lists.freedesktop.org] On
> Behalf Of Tapani Pälli
> Sent: Monday, January 4, 2016 8:56 AM
> To: mesa-dev at lists.freedesktop.org
> Subject: [Mesa-dev] [PATCH] 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 <tapani.palli at intel.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93532
> ---
>  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 e526119..570acfa 100644
> --- a/src/mesa/main/shader_query.cpp
> +++ b/src/mesa/main/shader_query.cpp
> @@ -1496,6 +1496,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.5.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev