[cogl] Revert "cogl-buffer: Stop warning spam running in sw rendering"
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] Revert "cogl-buffer: Stop warning spam running in sw rendering"
- Date: Wed, 6 Mar 2013 16:43:08 +0000 (UTC)
commit 8c5127c712570f1ea0d495a7fe7290ae5ee60ce6
Author: Robert Bragg <robert linux intel com>
Date: Wed Mar 6 16:37:19 2013 +0000
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 <neil linux intel com>
cogl/cogl-buffer.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/cogl/cogl-buffer.c b/cogl/cogl-buffer.c
index 6aa10dd..4edfa54 100644
--- a/cogl/cogl-buffer.c
+++ b/cogl/cogl-buffer.c
@@ -290,8 +290,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]