[clutter] test-cogl-blend-strings: Don't disable the TEXTURE_N test



commit 944d9bdd694b769acf2336a3cab52362f2fd32fd
Author: Neil Roberts <neil linux intel com>
Date:   Thu Aug 4 19:17:23 2011 +0100

    test-cogl-blend-strings: Don't disable the TEXTURE_N test
    
    This is now fixed in Cogl so there's no need to disable it.

 tests/conform/test-cogl-blend-strings.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/tests/conform/test-cogl-blend-strings.c b/tests/conform/test-cogl-blend-strings.c
index 6bec85b..852e722 100644
--- a/tests/conform/test-cogl-blend-strings.c
+++ b/tests/conform/test-cogl-blend-strings.c
@@ -355,14 +355,12 @@ on_paint (ClutterActor *actor, TestState *state)
                     "RGBA = INTERPOLATE (PREVIOUS, TEXTURE, PRIMARY)",
                     0x18181818); /* expected */
 
-#if 0 /* using TEXTURE_N appears to be broken in cogl-blend-string.c */
   test_tex_combine (state, 0, 1, /* position */
                     0xDEADBEEF, /* texture 0 color (not used) */
                     0x11223344, /* texture 1 color */
                     TEX_CONSTANT_UNUSED,
                     "RGBA = ADD (TEXTURE_1, TEXTURE)", /* tex combine */
                     0x22446688); /* expected */
-#endif
 
   test_tex_combine (state, 1, 1, /* position */
                     0x21314151, /* texture 0 color */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]