[cogl/cogl-1.18] Revert "framebuffer: Don't mark the clip dirty at mid scene"
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.18] Revert "framebuffer: Don't mark the clip dirty at mid scene"
- Date: Thu, 21 Nov 2013 12:51:56 +0000 (UTC)
commit d24f632d91d18909e2ca033e300b3679d927752f
Author: Neil Roberts <neil linux intel com>
Date: Thu Nov 21 12:12:21 2013 +0000
Revert "framebuffer: Don't mark the clip dirty at mid scene"
This patch doesn't look right because now nothing will ever set
clear_clip_dirty = TRUE. Presumably that would mean that if a
rectangle is drawn and then the journal is flushed before the
framebuffer is read, then it would think it could return the clear
color even though it shouldn't.
Perhaps a better approach would be to make a second version of
_cogl_framebuffer_mark_mid_scene that doesn't set the clear_clip_dirty
flag and call that from the journal instead. As this patch was pushed
without review and without first going into the master branch I think
it makes sense to just revert it and apply a new version to master.
This reverts commit 3eb63f67a34420b30ef812a1610aa9e9a80a93a3.
cogl/cogl-framebuffer.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index bc76bd4..4957b38 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -235,6 +235,7 @@ _cogl_framebuffer_clear_without_flush4f (CoglFramebuffer *framebuffer,
void
_cogl_framebuffer_mark_mid_scene (CoglFramebuffer *framebuffer)
{
+ framebuffer->clear_clip_dirty = TRUE;
framebuffer->mid_scene = TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]