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

@@ -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_TIMER(A,B,C,D,E) G_STMT_START{ (void)0; }G_STMT_END
-#define COGL_STATIC_COUNTER(A,B,C,D) extern void _cogl_dummy_decl (void)
+#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

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);

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 *

cogl/tests/conform/test-alpha-textures.c

@@ -2,6 +2,7 @@
 
 #include <string.h>
 
+#include "test-declarations.h"
 #include "test-utils.h"
 
 static void

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

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

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,
+test_blend_paint (TestState  *state,
-            int x,
+                  int         x,
-            int y,
+                  int         y,
-            uint32_t src_color,
+                  uint32_t    src_color,
-            uint32_t dst_color,
+                  uint32_t    dst_color,
-            const char *blend_string,
+                  const char *blend_string,
-            uint32_t blend_constant,
+                  uint32_t    blend_constant,
-            uint32_t expected_result)
+                  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 */
+  test_blend_paint (state, 0, 0, /* position */
-              0xff0000ff, /* src */
+                    0xff0000ff, /* src */
-              0xffffffff, /* dst */
+                    0xffffffff, /* dst */
-              "RGBA = ADD (SRC_COLOR, 0)",
+                    "RGBA = ADD (SRC_COLOR, 0)",
-              BLEND_CONSTANT_UNUSED,
+                    BLEND_CONSTANT_UNUSED,
-              0xff0000ff); /* expected */
+                    0xff0000ff); /* expected */
 
-  test_blend (state, 1, 0, /* position */
+  test_blend_paint (state, 1, 0, /* position */
-              0x11223344, /* src */
+                    0x11223344, /* src */
-              0x11223344, /* dst */
+                    0x11223344, /* dst */
-              "RGBA = ADD (SRC_COLOR, DST_COLOR)",
+                    "RGBA = ADD (SRC_COLOR, DST_COLOR)",
-              BLEND_CONSTANT_UNUSED,
+                    BLEND_CONSTANT_UNUSED,
-              0x22446688); /* expected */
+                    0x22446688); /* expected */
 
-  test_blend (state, 2, 0, /* position */
+  test_blend_paint (state, 2, 0, /* position */
-              0x80808080, /* src */
+                    0x80808080, /* src */
-              0xffffffff, /* dst */
+                    0xffffffff, /* dst */
-              "RGBA = ADD (SRC_COLOR * (CONSTANT), 0)",
+                    "RGBA = ADD (SRC_COLOR * (CONSTANT), 0)",
-              0x80808080, /* constant (RGBA all = 0.5 when normalized) */
+                    0x80808080, /* constant (RGBA all = 0.5 when normalized) */
-              0x40404040); /* expected */
+                    0x40404040); /* expected */
 
-  test_blend (state, 3, 0, /* position */
+  test_blend_paint (state, 3, 0, /* position */
-              0x80000080, /* src (alpha = 0.5 when normalized) */
+                    0x80000080, /* src (alpha = 0.5 when normalized) */
-              0x40000000, /* dst */
+                    0x40000000, /* dst */
-              "RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]),"
+                    "RGBA = ADD (SRC_COLOR * (SRC_COLOR[A]),"
-              "            DST_COLOR * (1-SRC_COLOR[A]))",
+                    "            DST_COLOR * (1-SRC_COLOR[A]))",
-              BLEND_CONSTANT_UNUSED,
+                    BLEND_CONSTANT_UNUSED,
-              0x60000040); /* expected */
+                    0x60000040); /* expected */
 
   /* XXX:
    * For all texture combine tests tex0 will use a combine mode of

cogl/tests/conform/test-blend.c

@@ -2,6 +2,7 @@
 
 #include <string.h>
 
+#include "test-declarations.h"
 #include "test-utils.h"
 
 static void

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)         \

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

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);        \

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

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

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 */

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

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

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)
 {

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

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

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

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

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

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 */

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

cogl/tests/conform/test-path-clip.c

@@ -3,6 +3,7 @@
 
 #include <string.h>
 
+#include "test-declarations.h"
 #include "test-utils.h"
 
 void

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

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

cogl/tests/conform/test-pipeline-shader-state.c

@@ -2,6 +2,7 @@
 
 #include <string.h>
 
+#include "test-declarations.h"
 #include "test-utils.h"
 
 void

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

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

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

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

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

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

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

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;

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

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"
 
 /*

cogl/tests/conform/test-snippets.c

@@ -2,6 +2,7 @@
 
 #include <string.h>
 
+#include "test-declarations.h"
 #include "test-utils.h"
 
 typedef struct _TestState

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

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

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

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

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

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

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"
 

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

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

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"
 
 /*