summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2015-09-23 12:20:43 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2015-09-23 13:57:11 +0100
commitd6f415d491533b3c6a69becfbbafc2f7592c3eb5 (patch)
treeeea4921ffcf8c3cf61b7ad2f113a19cf4be2ad5e
parent85e0b084592e6beef2987b02e34a3909f35708e0 (diff)
downloadcogl-d6f415d491533b3c6a69becfbbafc2f7592c3eb5.tar.gz
Journal: Skip journal dumping when unsupported
GLES2 does not support passing READ to glMapBuffer; attempting to call cogl_buffer_map for read on ES2 will bring it down with an assert. Make sure COGL_DEBUG=journal doesn't do this when it's not possible. Signed-off-by: Daniel Stone <daniels@collabora.com> https://bugzilla.gnome.org/show_bug.cgi?id=728355
-rw-r--r--cogl/cogl-journal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c
index dff34a0a..8ffe25f9 100644
--- a/cogl/cogl-journal.c
+++ b/cogl/cogl-journal.c
@@ -650,7 +650,8 @@ _cogl_journal_flush_vbo_offsets_and_entries (CoglJournalEntry *batch_start,
*/
state->current_vertex = 0;
- if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_JOURNAL)))
+ if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_JOURNAL)) &&
+ cogl_has_feature (ctx, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ))
{
uint8_t *verts;