[Mesa-dev] [PATCH] glsl: Drop bad ASSERT_TRUE in gl_CullDistance link_varyings test.

[Jordan Justen]

On 2016-05-13 19:26:37, Kenneth Graunke wrote:
> I don't know what the intention was here, but this function returns
> void.  We can't assert anything about its return value.

c1bbaff1e83f901d67d78f9e1ddfe8291dd09bfa seems to be related, and
appears to have changed this file similarly for some other cases.
Maybe a rebase issue.

There is a linker::populate_consumer_input_sets prototype at the top
of the file that has bool rather than void for the return. Can you
update it too?

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>

> 
> Fixes "make check" failures.
> 
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/compiler/glsl/tests/varyings_test.cpp | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/compiler/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp
> index 936f495..09bf1eb 100644
> --- a/src/compiler/glsl/tests/varyings_test.cpp
> +++ b/src/compiler/glsl/tests/varyings_test.cpp
> @@ -210,11 +210,11 @@ TEST_F(link_varyings, gl_CullDistance)
>  
>     ir.push_tail(culldistance);
>  
> -   ASSERT_TRUE(linker::populate_consumer_input_sets(mem_ctx,
> -                                                    &ir,
> -                                                    consumer_inputs,
> -                                                    consumer_interface_inputs,
> -                                                    junk));
> +   linker::populate_consumer_input_sets(mem_ctx,
> +                                        &ir,
> +                                        consumer_inputs,
> +                                        consumer_interface_inputs,
> +                                        junk);
>  
>     EXPECT_EQ(culldistance, junk[VARYING_SLOT_CULL_DIST0]);
>     EXPECT_TRUE(is_empty(consumer_inputs));
> -- 
> 2.8.2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev