From 46e4bd3a827861d568500282d21b75fc1a15e4c9 Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@openedhand.com>
Date: Wed, 12 Nov 2008 10:55:06 +0000
Subject: [PATCH] 	Fix warnings in mesh tests

	* tests/conform/test-mesh-mutability.c (on_paint):
	* tests/conform/test-mesh-interleved.c (on_paint):
	* tests/conform/test-mesh-contiguous.c (on_paint): Use g_usleep
	instead of sleep

	* tests/conform/test-mesh-mutability.c (queue_redraw):
	* tests/conform/test-mesh-interleved.c (queue_redraw):
	* tests/conform/test-mesh-contiguous.c (queue_redraw): Added
	missing return statement

	* clutter/cogl/cogl-mesh.h: Add a declaration for
	cogl_mesh_submit

	* clutter/cogl/common/cogl-mesh.c (cogl_mesh_submit): Move the
	documentation to cogl-mesh.h to match the rest of the functions
---
 cogl-mesh.h        | 13 +++++++++++++
 common/cogl-mesh.c | 10 ----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/cogl-mesh.h b/cogl-mesh.h
index 0ce3f83e5..e0c8f00c2 100644
--- a/cogl-mesh.h
+++ b/cogl-mesh.h
@@ -262,6 +262,19 @@ cogl_mesh_draw_range_elements (CoglHandle handle,
 			       GLenum type,
 			       const GLvoid *indices);
 
+/**
+ * cogl_mesh_submit:
+ * @handle: A Cogl mesh handle
+ *
+ * This function copies all the user added attributes into a buffer object
+ * managed by the OpenGL driver.
+ *
+ * After the attributes have been submitted, then you may no longer add or
+ * remove attributes from a mesh, though you can enable or disable them.
+ */
+void
+cogl_mesh_submit (CoglHandle handle);
+
 /**
  * cogl_mesh_ref:
  * @handle: a @CoglHandle.
diff --git a/common/cogl-mesh.c b/common/cogl-mesh.c
index 5727dee9d..281b374c1 100644
--- a/common/cogl-mesh.c
+++ b/common/cogl-mesh.c
@@ -1094,16 +1094,6 @@ resolve_new_cogl_mesh_vbo (CoglMesh *mesh,
     }
 }
 
-/**
- * cogl_mesh_submit:
- * @handle: A Cogl mesh handle
- * 
- * This function copies all the user added attributes into a buffer object
- * managed by the OpenGL driver.
- *
- * After the attributes have been submitted, then you may no longer add or
- * remove attributes from a mesh, though you can enable or disable them.
- */
 void
 cogl_mesh_submit (CoglHandle handle)
 {