From e886ad46e0faffd3e9e2c9042468f461c3db702e Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 6 Mar 2013 16:37:19 +0000 Subject: [PATCH] Revert "cogl-buffer: Stop warning spam running in sw rendering" This reverts commit 83dbf79986981fac9ec0f2575b7c7cb32f629f0f. On further consideration we realized that needing this change either indicated a bug in the code using cogl, or that it was a symptom of some other bug in Cogl resulting in us returning NULL in cogl_buffer_map_range but not returning a CoglError too. Reviewed-by: Neil Roberts (cherry picked from commit 8c5127c712570f1ea0d495a7fe7290ae5ee60ce6) --- cogl/cogl-buffer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cogl/cogl-buffer.c b/cogl/cogl-buffer.c index 48d0a7dcc..0600e01b9 100644 --- a/cogl/cogl-buffer.c +++ b/cogl/cogl-buffer.c @@ -304,8 +304,7 @@ _cogl_buffer_map_range_for_fill_or_fallback (CoglBuffer *buffer, if (ret) return ret; - if (ignore_error) - cogl_error_free (ignore_error); + cogl_error_free (ignore_error); /* If the map fails then we'll use a temporary buffer to fill the data and then upload it using cogl_buffer_set_data when