[cogl] tests: Move the create_color_texture function to test-utils
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] tests: Move the create_color_texture function to test-utils
- Date: Mon, 13 Feb 2012 17:32:01 +0000 (UTC)
commit d7164f9579d92f383fb6e7db26cfcd92a93f63b6
Author: Neil Roberts <neil linux intel com>
Date: Fri Feb 10 16:57:24 2012 +0000
tests: Move the create_color_texture function to test-utils
This adds a shared utility function to create a 1x1 texture with a
given color.
Reviewed-by: Robert Bragg <robert linux intel com>
tests/conform/test-sparse-pipeline.c | 23 ++---------------------
tests/conform/test-utils.c | 17 +++++++++++++++++
tests/conform/test-utils.h | 11 +++++++++++
3 files changed, 30 insertions(+), 21 deletions(-)
---
diff --git a/tests/conform/test-sparse-pipeline.c b/tests/conform/test-sparse-pipeline.c
index 433c0ba..ec8c987 100644
--- a/tests/conform/test-sparse-pipeline.c
+++ b/tests/conform/test-sparse-pipeline.c
@@ -11,25 +11,6 @@ typedef struct _TestState
CoglFramebuffer *fb;
} TestState;
-static CoglTexture *
-create_color_texture (CoglContext *context,
- guint32 color)
-{
- CoglTexture2D *tex_2d;
-
- color = GUINT32_TO_BE (color);
-
- tex_2d = cogl_texture_2d_new_from_data (context,
- 1, 1, /* width/height */
- COGL_PIXEL_FORMAT_RGBA_8888_PRE,
- COGL_PIXEL_FORMAT_RGBA_8888_PRE,
- 4, /* rowstride */
- (guint8 *) &color,
- NULL);
-
- return COGL_TEXTURE (tex_2d);
-}
-
static void
test_sparse_layer_combine (TestState *state)
{
@@ -43,8 +24,8 @@ test_sparse_layer_combine (TestState *state)
creating a pipeline with very large layer numbers. This should
end up being mapped to much smaller unit numbers */
- tex1 = create_color_texture (state->context, 0xff0000ff);
- tex2 = create_color_texture (state->context, 0x00ff00ff);
+ tex1 = test_utils_create_color_texture (state->context, 0xff0000ff);
+ tex2 = test_utils_create_color_texture (state->context, 0x00ff00ff);
pipeline = cogl_pipeline_new ();
diff --git a/tests/conform/test-utils.c b/tests/conform/test-utils.c
index a5ba891..61e5c01 100644
--- a/tests/conform/test-utils.c
+++ b/tests/conform/test-utils.c
@@ -151,4 +151,21 @@ test_utils_check_region (int x, int y,
g_free (pixels);
}
+CoglTexture *
+test_utils_create_color_texture (CoglContext *context,
+ guint32 color)
+{
+ CoglTexture2D *tex_2d;
+
+ color = GUINT32_TO_BE (color);
+ tex_2d = cogl_texture_2d_new_from_data (context,
+ 1, 1, /* width/height */
+ COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+ COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+ 4, /* rowstride */
+ (guint8 *) &color,
+ NULL);
+
+ return COGL_TEXTURE (tex_2d);
+}
diff --git a/tests/conform/test-utils.h b/tests/conform/test-utils.h
index c530374..9bc8e20 100644
--- a/tests/conform/test-utils.h
+++ b/tests/conform/test-utils.h
@@ -101,4 +101,15 @@ test_utils_check_region (int x, int y,
void
test_utils_compare_pixel (const guint8 *screen_pixel, guint32 expected_pixel);
+/*
+ * test_utils_create_color_texture:
+ * @context: A #CoglContext
+ * @color: A color to put in the texture
+ *
+ * Creates a 1x1-pixel RGBA texture filled with the given color.
+ */
+CoglTexture *
+test_utils_create_color_texture (CoglContext *context,
+ guint32 color);
+
#endif /* _TEST_UTILS_H_ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]