From 060f1488e043c31b5c6841a719a5bc0cb7e8c30b Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 16 Jun 2009 00:45:44 +0100 Subject: [PATCH] [test-cogl-tex-getset] Assume a premultiplied pixel format test-cogl-tex-getset was assuming it was dealing with COGL_PIXEL_FORMAT_RGBA_8888 but since merging the premultiplcation branch the pixel format is actually COGL_PIXEL_FORMAT_RGBA_8888_PRE --- tests/interactive/test-cogl-tex-getset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/interactive/test-cogl-tex-getset.c b/tests/interactive/test-cogl-tex-getset.c index b85bd7665..fb56b3b88 100644 --- a/tests/interactive/test-cogl-tex-getset.c +++ b/tests/interactive/test-cogl-tex-getset.c @@ -147,8 +147,8 @@ test_coglbox_init (TestCoglbox *self) /* Obtain pixel data */ format = cogl_texture_get_format (priv->cogl_tex_id[0]); - g_assert(format == COGL_PIXEL_FORMAT_RGBA_8888 || - format == COGL_PIXEL_FORMAT_ARGB_8888); + g_assert(format == COGL_PIXEL_FORMAT_RGBA_8888_PRE || + format == COGL_PIXEL_FORMAT_ARGB_8888_PRE); width = cogl_texture_get_width (priv->cogl_tex_id[0]); height = cogl_texture_get_height (priv->cogl_tex_id[0]); @@ -188,7 +188,7 @@ test_coglbox_init (TestCoglbox *self) for (x=0; x