brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

texture: Do not use clutter_get_timestamp()

Browse Source 
The clutter_get_timestamp() output depends on whether Clutter was
compiled with debugging support — it's meant to be used only by the
debugging notes, and it should not be used for anything else.
This commit is contained in:
Emmanuele Bassi 2011-11-15 14:59:50 +00:00
parent 58b6ad787b
commit f63891f030
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/clutter-texture.c
View File

@ -1759,13 +1759,11 @@ clutter_texture_async_load_complete (ClutterTexture *self,
static gboolean static gboolean
texture_repaint_upload_func (gpointer user_data) texture_repaint_upload_func (gpointer user_data)
{ {
gulong start_time;
g_mutex_lock (&upload_list_mutex); g_mutex_lock (&upload_list_mutex);
if (upload_list != NULL) if (upload_list != NULL)
{ {
start_time = clutter_get_timestamp (); gint64 start_time = g_get_monotonic_time ();
/* continue uploading textures as long as we havent spent more /* continue uploading textures as long as we havent spent more
* then 5ms doing so this stage redraw cycle. * then 5ms doing so this stage redraw cycle.
@ -1794,7 +1792,8 @@ texture_repaint_upload_func (gpointer user_data)
upload_list = g_list_remove (upload_list, async_data); upload_list = g_list_remove (upload_list, async_data);
clutter_texture_async_data_free (async_data); clutter_texture_async_data_free (async_data);
} }
while (upload_list && clutter_get_timestamp () < start_time + 5 * 1000); while (upload_list != NULL &&
g_get_monotonic_time () < start_time + 5 * 1000000L);
} }
if (upload_list != NULL) if (upload_list != NULL)