[mutter] test: use correct enum
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] test: use correct enum
- Date: Tue, 19 Nov 2019 21:45:15 +0000 (UTC)
commit d3afe4308a8188f46a6d4646a2a8d78e44e12961
Author: Thomas Hindoe Paaboel Andersen <phomes gmail com>
Date: Fri Nov 15 23:58:14 2019 +0100
test: use correct enum
The function create_texture() in test-wrap-modes.c takes a
TestUtilsTextureFlags. However a CoglTextureFlags is passed instead
in two calls. As the enums are identical this patch changes it to
use the TestUtils type.
The enum definitions:
typedef enum
{
COGL_TEXTURE_NONE = 0,
COGL_TEXTURE_NO_AUTO_MIPMAP = 1 << 0,
COGL_TEXTURE_NO_SLICING = 1 << 1,
COGL_TEXTURE_NO_ATLAS = 1 << 2
} CoglTextureFlags;
typedef enum
{
TEST_UTILS_TEXTURE_NONE = 0,
TEST_UTILS_TEXTURE_NO_AUTO_MIPMAP = 1 << 0,
TEST_UTILS_TEXTURE_NO_SLICING = 1 << 1,
TEST_UTILS_TEXTURE_NO_ATLAS = 1 << 2
} TestUtilsTextureFlags;
https://gitlab.gnome.org/GNOME/mutter/merge_requests/938
cogl/tests/conform/test-wrap-modes.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cogl/tests/conform/test-wrap-modes.c b/cogl/tests/conform/test-wrap-modes.c
index e1985b8e8..92a609ec3 100644
--- a/cogl/tests/conform/test-wrap-modes.c
+++ b/cogl/tests/conform/test-wrap-modes.c
@@ -253,7 +253,7 @@ paint (TestState *state)
cogl_object_unref (state->texture);
/* Draw the tests using cogl_polygon */
- state->texture = create_texture (COGL_TEXTURE_NO_ATLAS);
+ state->texture = create_texture (TEST_UTILS_TEXTURE_NO_ATLAS);
cogl_push_matrix ();
cogl_translate (0.0f, TEX_SIZE * 4.0f, 0.0f);
draw_tests_polygon (state);
@@ -261,7 +261,7 @@ paint (TestState *state)
cogl_object_unref (state->texture);
/* Draw the tests using a vertex buffer */
- state->texture = create_texture (COGL_TEXTURE_NO_ATLAS);
+ state->texture = create_texture (TEST_UTILS_TEXTURE_NO_ATLAS);
cogl_push_matrix ();
cogl_translate (0.0f, TEX_SIZE * 6.0f, 0.0f);
draw_tests_vbo (state);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]