Mesa (master): glsl: Drop bad ASSERT_TRUE in gl_CullDistance link_varyings test.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon May 16 06:49:45 UTC 2016
Module: Mesa
Branch: master
Commit: d4d7e1516b4f14b65192ae856a44a2c10788c9fe
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4d7e1516b4f14b65192ae856a44a2c10788c9fe
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri May 13 19:26:37 2016 -0700
glsl: Drop bad ASSERT_TRUE in gl_CullDistance link_varyings test.
I don't know what the intention was here, but this function returns
void. We can't assert anything about its return value.
Fixes "make check" failures.
v2: Also fix prototype for the function (caught by Jordan).
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
---
src/compiler/glsl/tests/varyings_test.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/compiler/glsl/tests/varyings_test.cpp b/src/compiler/glsl/tests/varyings_test.cpp
index 936f495..cabda7a 100644
--- a/src/compiler/glsl/tests/varyings_test.cpp
+++ b/src/compiler/glsl/tests/varyings_test.cpp
@@ -35,7 +35,7 @@
*/
namespace linker {
-bool
+void
populate_consumer_input_sets(void *mem_ctx, exec_list *ir,
hash_table *consumer_inputs,
hash_table *consumer_interface_inputs,
@@ -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));
More information about the mesa-commit
mailing list