From 43bc0a4b0de72743c4eedd3cd6175c8b8c6cc658 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Sat, 28 Jan 2012 13:44:39 +0000 Subject: [PATCH] texture: Flush the dependent journals on get_data When calling cogl_texture_get_data we need to ensure that any framebuffers rendering to the texture have flushed their journals. https://bugzilla.gnome.org/show_bug.cgi?id=668913 Reviewed-by: Robert Bragg --- cogl/cogl-texture.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cogl/cogl-texture.c b/cogl/cogl-texture.c index bb8930a39..d75f6c124 100644 --- a/cogl/cogl-texture.c +++ b/cogl/cogl-texture.c @@ -1243,6 +1243,11 @@ cogl_texture_get_data (CoglTexture *texture, } tg_data.success = TRUE; + /* If there are any dependent framebuffers on the texture then we + need to flush their journals so the texture contents will be + up-to-date */ + _cogl_texture_flush_journal_rendering (texture); + /* Iterating through the subtextures allows piecing together * the data for a sliced texture, and allows us to do the * read-from-framebuffer logic here in a simple fashion rather than