[mutter] cogl: Add missing function declarations
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Add missing function declarations
- Date: Tue, 22 Jan 2019 17:39:25 +0000 (UTC)
commit 982d135ace41ffd6ff0eb879e3d600ad1f2cd839
Author: Jonas Ådahl <jadahl gmail com>
Date: Sun Jan 20 11:41:48 2019 +0100
cogl: Add missing function declarations
In plenty of places a non-static function was defined but didn't have
the corresponding declaration. Fix this by adding them, or alternatively
making them static.
cogl/cogl/cogl-profile.h | 4 +-
cogl/test-fixtures/test-utils.c | 2 +-
cogl/tests/conform/test-alpha-test.c | 1 +
cogl/tests/conform/test-alpha-textures.c | 1 +
cogl/tests/conform/test-atlas-migration.c | 1 +
cogl/tests/conform/test-backface-culling.c | 1 +
cogl/tests/conform/test-blend-strings.c | 73 +++++++++++-----------
cogl/tests/conform/test-blend.c | 1 +
cogl/tests/conform/test-color-hsl.c | 1 +
cogl/tests/conform/test-color-mask.c | 1 +
cogl/tests/conform/test-conform-main.c | 2 +-
cogl/tests/conform/test-copy-replace-texture.c | 1 +
cogl/tests/conform/test-custom-attributes.c | 1 +
cogl/tests/conform/test-declarations.h | 56 +++++++++++++++++
cogl/tests/conform/test-depth-test.c | 1 +
cogl/tests/conform/test-euler-quaternion.c | 1 +
cogl/tests/conform/test-fence.c | 5 +-
cogl/tests/conform/test-framebuffer-get-bits.c | 1 +
cogl/tests/conform/test-gles2-context.c | 1 +
cogl/tests/conform/test-just-vertex-shader.c | 1 +
cogl/tests/conform/test-layer-remove.c | 1 +
cogl/tests/conform/test-map-buffer-range.c | 1 +
cogl/tests/conform/test-npot-texture.c | 1 +
cogl/tests/conform/test-offscreen.c | 1 +
cogl/tests/conform/test-path-clip.c | 1 +
cogl/tests/conform/test-path.c | 1 +
.../conform/test-pipeline-cache-unrefs-texture.c | 1 +
cogl/tests/conform/test-pipeline-shader-state.c | 1 +
cogl/tests/conform/test-pipeline-uniforms.c | 1 +
cogl/tests/conform/test-pipeline-user-matrix.c | 1 +
cogl/tests/conform/test-pixel-buffer.c | 1 +
cogl/tests/conform/test-point-size-attribute.c | 1 +
cogl/tests/conform/test-point-size.c | 1 +
cogl/tests/conform/test-point-sprite.c | 1 +
cogl/tests/conform/test-premult.c | 1 +
cogl/tests/conform/test-primitive-and-journal.c | 1 +
cogl/tests/conform/test-primitive.c | 1 +
cogl/tests/conform/test-read-texture-formats.c | 1 +
cogl/tests/conform/test-snippets.c | 1 +
cogl/tests/conform/test-sparse-pipeline.c | 1 +
cogl/tests/conform/test-sub-texture.c | 1 +
cogl/tests/conform/test-texture-3d.c | 1 +
cogl/tests/conform/test-texture-get-set-data.c | 1 +
cogl/tests/conform/test-texture-no-allocate.c | 1 +
cogl/tests/conform/test-texture-rg.c | 1 +
cogl/tests/conform/test-version.c | 1 +
cogl/tests/conform/test-wrap-modes.c | 1 +
cogl/tests/conform/test-wrap-rectangle-textures.c | 1 +
cogl/tests/conform/test-write-texture-formats.c | 1 +
49 files changed, 143 insertions(+), 42 deletions(-)
---
diff --git a/cogl/cogl/cogl-profile.h b/cogl/cogl/cogl-profile.h
index db95647e9..98c2fd456 100644
--- a/cogl/cogl/cogl-profile.h
+++ b/cogl/cogl/cogl-profile.h
@@ -53,8 +53,8 @@ _cogl_profile_trace_message (const char *format, ...);
#else
-#define COGL_STATIC_TIMER(A,B,C,D,E) extern void _cogl_dummy_decl (void)
-#define COGL_STATIC_COUNTER(A,B,C,D) extern void _cogl_dummy_decl (void)
+#define COGL_STATIC_TIMER(A,B,C,D,E) G_STMT_START{ (void)0; }G_STMT_END
+#define COGL_STATIC_COUNTER(A,B,C,D) G_STMT_START{ (void)0; }G_STMT_END
#define COGL_COUNTER_INC(A,B) G_STMT_START{ (void)0; }G_STMT_END
#define COGL_COUNTER_DEC(A,B) G_STMT_START{ (void)0; }G_STMT_END
#define COGL_TIMER_START(A,B) G_STMT_START{ (void)0; }G_STMT_END
diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
index e920dd8f6..02494be42 100644
--- a/cogl/test-fixtures/test-utils.c
+++ b/cogl/test-fixtures/test-utils.c
@@ -98,7 +98,7 @@ check_flags (TestFlags flags,
return TRUE;
}
-CoglBool
+static CoglBool
is_boolean_env_set (const char *variable)
{
char *val = getenv (variable);
diff --git a/cogl/tests/conform/test-alpha-test.c b/cogl/tests/conform/test-alpha-test.c
index e74f6d8e0..c46f7c218 100644
--- a/cogl/tests/conform/test-alpha-test.c
+++ b/cogl/tests/conform/test-alpha-test.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
static CoglTexture2D *
diff --git a/cogl/tests/conform/test-alpha-textures.c b/cogl/tests/conform/test-alpha-textures.c
index dccd30e11..05a2a8a37 100644
--- a/cogl/tests/conform/test-alpha-textures.c
+++ b/cogl/tests/conform/test-alpha-textures.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
static void
diff --git a/cogl/tests/conform/test-atlas-migration.c b/cogl/tests/conform/test-atlas-migration.c
index 39e8a3c1f..b5d04c3d3 100644
--- a/cogl/tests/conform/test-atlas-migration.c
+++ b/cogl/tests/conform/test-atlas-migration.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define N_TEXTURES 128
diff --git a/cogl/tests/conform/test-backface-culling.c b/cogl/tests/conform/test-backface-culling.c
index e90c2f5ec..7a357627f 100644
--- a/cogl/tests/conform/test-backface-culling.c
+++ b/cogl/tests/conform/test-backface-culling.c
@@ -4,6 +4,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* Size the texture so that it is just off a power of two to encourage
diff --git a/cogl/tests/conform/test-blend-strings.c b/cogl/tests/conform/test-blend-strings.c
index f49c8603b..6a50ad5fe 100644
--- a/cogl/tests/conform/test-blend-strings.c
+++ b/cogl/tests/conform/test-blend-strings.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define QUAD_WIDTH 20
@@ -26,14 +27,14 @@ typedef struct _TestState
static void
-test_blend (TestState *state,
- int x,
- int y,
- uint32_t src_color,
- uint32_t dst_color,
- const char *blend_string,
- uint32_t blend_constant,
- uint32_t expected_result)
+test_blend_paint (TestState *state,
+ int x,
+ int y,
+ uint32_t src_color,
+ uint32_t dst_color,
+ const char *blend_string,
+ uint32_t blend_constant,
+ uint32_t expected_result)
{
/* src color */
uint8_t Sr = MASK_RED (src_color);
@@ -294,34 +295,34 @@ test_tex_combine (TestState *state,
static void
paint (TestState *state)
{
- test_blend (state, 0, 0, /* position */
- 0xff0000ff, /* src */
- 0xffffffff, /* dst */
- "RGBA = ADD (SRC_COLOR, 0)",
- BLEND_CONSTANT_UNUSED,
- 0xff0000ff); /* expected */
-
- test_blend (state, 1, 0, /* position */
- 0x11223344, /* src */
- 0x11223344, /* dst */
- "RGBA = ADD (SRC_COLOR, DST_COLOR)",
- BLEND_CONSTANT_UNUSED,
- 0x22446688); /* expected */
-
- test_blend (state, 2, 0, /* position */
- 0x80808080, /* src */
- 0xffffffff, /* dst */
- "RGBA = ADD (SRC_COLOR * (CONSTANT), 0)",
- 0x80808080, /* constant (RGBA all = 0.5 when normalized) */
- 0x40404040); /* expected */
-
- test_blend (state, 3, 0, /* position */
- 0x80000080, /* src (alpha = 0.5 when normalized) */
- 0x40000000, /* dst */
- "RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]),"
- " DST_COLOR * (1-SRC_COLOR[A]))",
- BLEND_CONSTANT_UNUSED,
- 0x60000040); /* expected */
+ test_blend_paint (state, 0, 0, /* position */
+ 0xff0000ff, /* src */
+ 0xffffffff, /* dst */
+ "RGBA = ADD (SRC_COLOR, 0)",
+ BLEND_CONSTANT_UNUSED,
+ 0xff0000ff); /* expected */
+
+ test_blend_paint (state, 1, 0, /* position */
+ 0x11223344, /* src */
+ 0x11223344, /* dst */
+ "RGBA = ADD (SRC_COLOR, DST_COLOR)",
+ BLEND_CONSTANT_UNUSED,
+ 0x22446688); /* expected */
+
+ test_blend_paint (state, 2, 0, /* position */
+ 0x80808080, /* src */
+ 0xffffffff, /* dst */
+ "RGBA = ADD (SRC_COLOR * (CONSTANT), 0)",
+ 0x80808080, /* constant (RGBA all = 0.5 when normalized) */
+ 0x40404040); /* expected */
+
+ test_blend_paint (state, 3, 0, /* position */
+ 0x80000080, /* src (alpha = 0.5 when normalized) */
+ 0x40000000, /* dst */
+ "RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]),"
+ " DST_COLOR * (1-SRC_COLOR[A]))",
+ BLEND_CONSTANT_UNUSED,
+ 0x60000040); /* expected */
/* XXX:
* For all texture combine tests tex0 will use a combine mode of
diff --git a/cogl/tests/conform/test-blend.c b/cogl/tests/conform/test-blend.c
index 3c6235b5f..720fcc02c 100644
--- a/cogl/tests/conform/test-blend.c
+++ b/cogl/tests/conform/test-blend.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
static void
diff --git a/cogl/tests/conform/test-color-hsl.c b/cogl/tests/conform/test-color-hsl.c
index 651ce5208..15f2fe84b 100644
--- a/cogl/tests/conform/test-color-hsl.c
+++ b/cogl/tests/conform/test-color-hsl.c
@@ -3,6 +3,7 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define cogl_assert_float(a, b) \
diff --git a/cogl/tests/conform/test-color-mask.c b/cogl/tests/conform/test-color-mask.c
index e80f46dae..df63de9ea 100644
--- a/cogl/tests/conform/test-color-mask.c
+++ b/cogl/tests/conform/test-color-mask.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define TEX_SIZE 128
diff --git a/cogl/tests/conform/test-conform-main.c b/cogl/tests/conform/test-conform-main.c
index 8084ea0cf..1c3987792 100644
--- a/cogl/tests/conform/test-conform-main.c
+++ b/cogl/tests/conform/test-conform-main.c
@@ -7,12 +7,12 @@
#include <stdlib.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* A bit of sugar for adding new conformance tests */
#define ADD_TEST(FUNC, REQUIREMENTS, KNOWN_FAIL_REQUIREMENTS) \
G_STMT_START { \
- extern void FUNC (void); \
if (strcmp (#FUNC, argv[1]) == 0) \
{ \
test_utils_init (REQUIREMENTS, KNOWN_FAIL_REQUIREMENTS); \
diff --git a/cogl/tests/conform/test-copy-replace-texture.c b/cogl/tests/conform/test-copy-replace-texture.c
index f11070ee8..7f0f319d6 100644
--- a/cogl/tests/conform/test-copy-replace-texture.c
+++ b/cogl/tests/conform/test-copy-replace-texture.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* Keep track of the number of textures that we've created and are
diff --git a/cogl/tests/conform/test-custom-attributes.c b/cogl/tests/conform/test-custom-attributes.c
index 633dc2ad8..dfb7cbdb2 100644
--- a/cogl/tests/conform/test-custom-attributes.c
+++ b/cogl/tests/conform/test-custom-attributes.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-declarations.h b/cogl/tests/conform/test-declarations.h
new file mode 100644
index 000000000..0dd9f1303
--- /dev/null
+++ b/cogl/tests/conform/test-declarations.h
@@ -0,0 +1,56 @@
+#ifndef COGL_TEST_DECLARATIONS_H
+#define COGL_TEST_DECLARATIONS_H
+
+void test_pipeline_user_matrix (void);
+void test_blend_strings (void);
+void test_blend (void);
+void test_premult (void);
+void test_path (void);
+void test_path_clip (void);
+void test_depth_test (void);
+void test_color_mask (void);
+void test_backface_culling (void);
+void test_layer_remove (void);
+void test_sparse_pipeline (void);
+void test_npot_texture (void);
+void test_sub_texture (void);
+void test_pixel_buffer_map (void);
+void test_pixel_buffer_set_data (void);
+void test_pixel_buffer_sub_region (void);
+void test_texture_3d (void);
+void test_wrap_modes (void);
+void test_texture_get_set_data (void);
+void test_atlas_migration (void);
+void test_read_texture_formats (void);
+void test_write_texture_formats (void);
+void test_alpha_textures (void);
+void test_wrap_rectangle_textures (void);
+void test_primitive (void);
+void test_just_vertex_shader (void);
+void test_pipeline_uniforms (void);
+void test_snippets (void);
+void test_custom_attributes (void);
+void test_offscreen (void);
+void test_framebuffer_get_bits (void);
+void test_point_size (void);
+void test_point_size_attribute (void);
+void test_point_size_attribute_snippet (void);
+void test_point_sprite (void);
+void test_point_sprite_orientation (void);
+void test_point_sprite_glsl (void);
+void test_alpha_test (void);
+void test_map_buffer_range (void);
+void test_primitive_and_journal (void);
+void test_copy_replace_texture (void);
+void test_pipeline_cache_unrefs_texture (void);
+void test_pipeline_shader_state (void);
+void test_gles2_context (void);
+void test_gles2_context_fbo (void);
+void test_gles2_context_copy_tex_image (void);
+void test_euler_quaternion (void);
+void test_color_hsl (void);
+void test_fence (void);
+void test_texture_no_allocate (void);
+void test_texture_rg (void);
+
+#endif /* COGL_TEST_DECLARATIONS_H */
diff --git a/cogl/tests/conform/test-depth-test.c b/cogl/tests/conform/test-depth-test.c
index bfa9d0e1f..aacedf5fe 100644
--- a/cogl/tests/conform/test-depth-test.c
+++ b/cogl/tests/conform/test-depth-test.c
@@ -4,6 +4,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define QUAD_WIDTH 20
diff --git a/cogl/tests/conform/test-euler-quaternion.c b/cogl/tests/conform/test-euler-quaternion.c
index c250bec0b..312667162 100644
--- a/cogl/tests/conform/test-euler-quaternion.c
+++ b/cogl/tests/conform/test-euler-quaternion.c
@@ -2,6 +2,7 @@
#include <math.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* Macros are used here instead of functions so that the
diff --git a/cogl/tests/conform/test-fence.c b/cogl/tests/conform/test-fence.c
index 1386bceca..6c429c1d7 100644
--- a/cogl/tests/conform/test-fence.c
+++ b/cogl/tests/conform/test-fence.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#include "cogl-config.h"
@@ -8,7 +9,7 @@
static GMainLoop *loop;
-gboolean
+static gboolean
timeout (void *user_data)
{
g_assert (!"timeout not reached");
@@ -16,7 +17,7 @@ timeout (void *user_data)
return FALSE;
}
-void
+static void
callback (CoglFence *fence,
void *user_data)
{
diff --git a/cogl/tests/conform/test-framebuffer-get-bits.c b/cogl/tests/conform/test-framebuffer-get-bits.c
index 31c220d78..d03f91b99 100644
--- a/cogl/tests/conform/test-framebuffer-get-bits.c
+++ b/cogl/tests/conform/test-framebuffer-get-bits.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
void
diff --git a/cogl/tests/conform/test-gles2-context.c b/cogl/tests/conform/test-gles2-context.c
index bedc30a02..1560dbaaa 100644
--- a/cogl/tests/conform/test-gles2-context.c
+++ b/cogl/tests/conform/test-gles2-context.c
@@ -3,6 +3,7 @@
#include <cogl/cogl-gles2.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-just-vertex-shader.c b/cogl/tests/conform/test-just-vertex-shader.c
index 60fcaf74c..d4e6ca807 100644
--- a/cogl/tests/conform/test-just-vertex-shader.c
+++ b/cogl/tests/conform/test-just-vertex-shader.c
@@ -4,6 +4,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-layer-remove.c b/cogl/tests/conform/test-layer-remove.c
index de1efeccd..fbfdd6473 100644
--- a/cogl/tests/conform/test-layer-remove.c
+++ b/cogl/tests/conform/test-layer-remove.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define TEST_SQUARE_SIZE 10
diff --git a/cogl/tests/conform/test-map-buffer-range.c b/cogl/tests/conform/test-map-buffer-range.c
index e9792405f..c4d28aaac 100644
--- a/cogl/tests/conform/test-map-buffer-range.c
+++ b/cogl/tests/conform/test-map-buffer-range.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
static uint8_t
diff --git a/cogl/tests/conform/test-npot-texture.c b/cogl/tests/conform/test-npot-texture.c
index 85c16c960..fb5639b5c 100644
--- a/cogl/tests/conform/test-npot-texture.c
+++ b/cogl/tests/conform/test-npot-texture.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* Non-power-of-two sized texture that should cause slicing */
diff --git a/cogl/tests/conform/test-offscreen.c b/cogl/tests/conform/test-offscreen.c
index 9bc14b7da..6dcc6a55f 100644
--- a/cogl/tests/conform/test-offscreen.c
+++ b/cogl/tests/conform/test-offscreen.c
@@ -2,6 +2,7 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define RED 0
diff --git a/cogl/tests/conform/test-path-clip.c b/cogl/tests/conform/test-path-clip.c
index ec2106129..7fcb299a1 100644
--- a/cogl/tests/conform/test-path-clip.c
+++ b/cogl/tests/conform/test-path-clip.c
@@ -3,6 +3,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
void
diff --git a/cogl/tests/conform/test-path.c b/cogl/tests/conform/test-path.c
index aa911d2fa..93779ebe2 100644
--- a/cogl/tests/conform/test-path.c
+++ b/cogl/tests/conform/test-path.c
@@ -3,6 +3,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define BLOCK_SIZE 16
diff --git a/cogl/tests/conform/test-pipeline-cache-unrefs-texture.c
b/cogl/tests/conform/test-pipeline-cache-unrefs-texture.c
index 5d278dcd0..81abe99e1 100644
--- a/cogl/tests/conform/test-pipeline-cache-unrefs-texture.c
+++ b/cogl/tests/conform/test-pipeline-cache-unrefs-texture.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* Keep track of the number of textures that we've created and are
diff --git a/cogl/tests/conform/test-pipeline-shader-state.c b/cogl/tests/conform/test-pipeline-shader-state.c
index 4d1e5f2b7..7bf0e72e6 100644
--- a/cogl/tests/conform/test-pipeline-shader-state.c
+++ b/cogl/tests/conform/test-pipeline-shader-state.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
void
diff --git a/cogl/tests/conform/test-pipeline-uniforms.c b/cogl/tests/conform/test-pipeline-uniforms.c
index 4d27558d2..ab447b1e5 100644
--- a/cogl/tests/conform/test-pipeline-uniforms.c
+++ b/cogl/tests/conform/test-pipeline-uniforms.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define LONG_ARRAY_SIZE 128
diff --git a/cogl/tests/conform/test-pipeline-user-matrix.c b/cogl/tests/conform/test-pipeline-user-matrix.c
index f7cdee8c8..7771073f3 100644
--- a/cogl/tests/conform/test-pipeline-user-matrix.c
+++ b/cogl/tests/conform/test-pipeline-user-matrix.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-pixel-buffer.c b/cogl/tests/conform/test-pixel-buffer.c
index a78516d06..fab66cab3 100644
--- a/cogl/tests/conform/test-pixel-buffer.c
+++ b/cogl/tests/conform/test-pixel-buffer.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define BITMAP_SIZE 256
diff --git a/cogl/tests/conform/test-point-size-attribute.c b/cogl/tests/conform/test-point-size-attribute.c
index a08d1daa9..538f26a0f 100644
--- a/cogl/tests/conform/test-point-size-attribute.c
+++ b/cogl/tests/conform/test-point-size-attribute.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* This test assumes the GL driver supports point sizes up to 16
diff --git a/cogl/tests/conform/test-point-size.c b/cogl/tests/conform/test-point-size.c
index 49d083325..c64b7e266 100644
--- a/cogl/tests/conform/test-point-size.c
+++ b/cogl/tests/conform/test-point-size.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* This test assumes the GL driver supports point sizes up to 16
diff --git a/cogl/tests/conform/test-point-sprite.c b/cogl/tests/conform/test-point-sprite.c
index 65ce9a859..5355c7569 100644
--- a/cogl/tests/conform/test-point-sprite.c
+++ b/cogl/tests/conform/test-point-sprite.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define POINT_SIZE 8
diff --git a/cogl/tests/conform/test-premult.c b/cogl/tests/conform/test-premult.c
index fa60bdf1e..384b46416 100644
--- a/cogl/tests/conform/test-premult.c
+++ b/cogl/tests/conform/test-premult.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define QUAD_WIDTH 32
diff --git a/cogl/tests/conform/test-primitive-and-journal.c b/cogl/tests/conform/test-primitive-and-journal.c
index f978cd5ee..c6c943605 100644
--- a/cogl/tests/conform/test-primitive-and-journal.c
+++ b/cogl/tests/conform/test-primitive-and-journal.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef CoglVertexP2C4 Vertex;
diff --git a/cogl/tests/conform/test-primitive.c b/cogl/tests/conform/test-primitive.c
index db264fc1c..8d738a03a 100644
--- a/cogl/tests/conform/test-primitive.c
+++ b/cogl/tests/conform/test-primitive.c
@@ -2,6 +2,7 @@
#include <string.h>
#include <stdlib.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-read-texture-formats.c b/cogl/tests/conform/test-read-texture-formats.c
index b4e3b0ff5..9add8127d 100644
--- a/cogl/tests/conform/test-read-texture-formats.c
+++ b/cogl/tests/conform/test-read-texture-formats.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <stdarg.h>
+#include "test-declarations.h"
#include "test-utils.h"
/*
diff --git a/cogl/tests/conform/test-snippets.c b/cogl/tests/conform/test-snippets.c
index a251fc162..9b19b221b 100644
--- a/cogl/tests/conform/test-snippets.c
+++ b/cogl/tests/conform/test-snippets.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-sparse-pipeline.c b/cogl/tests/conform/test-sparse-pipeline.c
index 2b618dc50..5e694d83c 100644
--- a/cogl/tests/conform/test-sparse-pipeline.c
+++ b/cogl/tests/conform/test-sparse-pipeline.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
typedef struct _TestState
diff --git a/cogl/tests/conform/test-sub-texture.c b/cogl/tests/conform/test-sub-texture.c
index f049f3fae..9e8d1164c 100644
--- a/cogl/tests/conform/test-sub-texture.c
+++ b/cogl/tests/conform/test-sub-texture.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define SOURCE_SIZE 32
diff --git a/cogl/tests/conform/test-texture-3d.c b/cogl/tests/conform/test-texture-3d.c
index 80d077a14..880503976 100644
--- a/cogl/tests/conform/test-texture-3d.c
+++ b/cogl/tests/conform/test-texture-3d.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define TEX_WIDTH 4
diff --git a/cogl/tests/conform/test-texture-get-set-data.c b/cogl/tests/conform/test-texture-get-set-data.c
index 59bd0f635..6bc68b387 100644
--- a/cogl/tests/conform/test-texture-get-set-data.c
+++ b/cogl/tests/conform/test-texture-get-set-data.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
static void
diff --git a/cogl/tests/conform/test-texture-no-allocate.c b/cogl/tests/conform/test-texture-no-allocate.c
index b0199a988..74726d627 100644
--- a/cogl/tests/conform/test-texture-no-allocate.c
+++ b/cogl/tests/conform/test-texture-no-allocate.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
/* Tests that the various texture types can be freed without being
diff --git a/cogl/tests/conform/test-texture-rg.c b/cogl/tests/conform/test-texture-rg.c
index 72a5ae930..e3ed2b529 100644
--- a/cogl/tests/conform/test-texture-rg.c
+++ b/cogl/tests/conform/test-texture-rg.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define TEX_WIDTH 8
diff --git a/cogl/tests/conform/test-version.c b/cogl/tests/conform/test-version.c
index 54398b472..afc87914a 100644
--- a/cogl/tests/conform/test-version.c
+++ b/cogl/tests/conform/test-version.c
@@ -1,5 +1,6 @@
#include <cogl/cogl.h>
+#include "test-declarations.h"
#include "test-utils.h"
#include "cogl-config.h"
diff --git a/cogl/tests/conform/test-wrap-modes.c b/cogl/tests/conform/test-wrap-modes.c
index e5a2a1a61..22fefb23a 100644
--- a/cogl/tests/conform/test-wrap-modes.c
+++ b/cogl/tests/conform/test-wrap-modes.c
@@ -3,6 +3,7 @@
#include <cogl/cogl.h>
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define TEX_SIZE 4
diff --git a/cogl/tests/conform/test-wrap-rectangle-textures.c
b/cogl/tests/conform/test-wrap-rectangle-textures.c
index 73b357536..0cc45115a 100644
--- a/cogl/tests/conform/test-wrap-rectangle-textures.c
+++ b/cogl/tests/conform/test-wrap-rectangle-textures.c
@@ -2,6 +2,7 @@
#include <string.h>
+#include "test-declarations.h"
#include "test-utils.h"
#define DRAW_SIZE 64
diff --git a/cogl/tests/conform/test-write-texture-formats.c b/cogl/tests/conform/test-write-texture-formats.c
index 76c434826..ca8015771 100644
--- a/cogl/tests/conform/test-write-texture-formats.c
+++ b/cogl/tests/conform/test-write-texture-formats.c
@@ -1,6 +1,7 @@
#include <cogl/cogl.h>
#include <stdarg.h>
+#include "test-declarations.h"
#include "test-utils.h"
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
