brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This is now fixed in Cogl so there's no need to disable it.
This commit is contained in:
Neil Roberts 2011-08-04 19:17:23 +01:00
parent 694649e50c
commit 944d9bdd69
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/conform/test-cogl-blend-strings.c
View File

@ -355,14 +355,12 @@ on_paint (ClutterActor *actor, TestState *state)
"RGBA = INTERPOLATE (PREVIOUS, TEXTURE, PRIMARY)", "RGBA = INTERPOLATE (PREVIOUS, TEXTURE, PRIMARY)",
0x18181818); /* expected */ 0x18181818); /* expected */
#if 0 /* using TEXTURE_N appears to be broken in cogl-blend-string.c */
test_tex_combine (state, 0, 1, /* position */ test_tex_combine (state, 0, 1, /* position */
0xDEADBEEF, /* texture 0 color (not used) */ 0xDEADBEEF, /* texture 0 color (not used) */
0x11223344, /* texture 1 color */ 0x11223344, /* texture 1 color */
TEX_CONSTANT_UNUSED, TEX_CONSTANT_UNUSED,
"RGBA = ADD (TEXTURE_1, TEXTURE)", /* tex combine */ "RGBA = ADD (TEXTURE_1, TEXTURE)", /* tex combine */
0x22446688); /* expected */ 0x22446688); /* expected */
#endif
test_tex_combine (state, 1, 1, /* position */ test_tex_combine (state, 1, 1, /* position */
0x21314151, /* texture 0 color */ 0x21314151, /* texture 0 color */