mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 17:40:40 -05:00
cogl/journal: Track dither
For the exact same reason that previous commit added viewport tracking, also add dither state tracking and avoid flushing the journal even more. https://gitlab.gnome.org/GNOME/mutter/merge_requests/402
This commit is contained in:
parent
0556138b9f
commit
c5b7d73ce2
@ -79,6 +79,7 @@ typedef struct _CoglJournalEntry
|
|||||||
CoglMatrixEntry *modelview_entry;
|
CoglMatrixEntry *modelview_entry;
|
||||||
CoglClipStack *clip_stack;
|
CoglClipStack *clip_stack;
|
||||||
float viewport[4];
|
float viewport[4];
|
||||||
|
gboolean dither_enabled;
|
||||||
/* Offset into ctx->logged_vertices */
|
/* Offset into ctx->logged_vertices */
|
||||||
size_t array_offset;
|
size_t array_offset;
|
||||||
int n_layers;
|
int n_layers;
|
||||||
|
@ -1044,6 +1044,49 @@ compare_entry_clip_stacks (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
|
|||||||
return entry0->clip_stack == entry1->clip_stack;
|
return entry0->clip_stack == entry1->clip_stack;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_cogl_journal_flush_dither_and_entries (CoglJournalEntry *batch_start,
|
||||||
|
int batch_len,
|
||||||
|
void *data)
|
||||||
|
{
|
||||||
|
CoglJournalFlushState *state = data;
|
||||||
|
CoglFramebuffer *framebuffer = state->journal->framebuffer;
|
||||||
|
CoglContext *ctx = framebuffer->context;
|
||||||
|
|
||||||
|
COGL_STATIC_TIMER (time_flush_dither_and_entries,
|
||||||
|
"Journal Flush", /* parent */
|
||||||
|
"flush: viewport+dither+clip+vbo+texcoords+pipeline+entries",
|
||||||
|
"The time spent flushing viewport + dither + clip + vbo + "
|
||||||
|
"texcoord offsets + pipeline + entries",
|
||||||
|
0 /* no application private data */);
|
||||||
|
|
||||||
|
COGL_TIMER_START (_cogl_uprof_context, time_flush_dither_and_entries);
|
||||||
|
|
||||||
|
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_BATCHING)))
|
||||||
|
g_print ("BATCHING: dither batch len = %d\n", batch_len);
|
||||||
|
|
||||||
|
cogl_framebuffer_set_dither_enabled (framebuffer, batch_start->dither_enabled);
|
||||||
|
ctx->current_draw_buffer_changes |= COGL_FRAMEBUFFER_STATE_DITHER;
|
||||||
|
|
||||||
|
_cogl_framebuffer_flush_state (framebuffer,
|
||||||
|
framebuffer,
|
||||||
|
COGL_FRAMEBUFFER_STATE_DITHER);
|
||||||
|
|
||||||
|
batch_and_call (batch_start,
|
||||||
|
batch_len,
|
||||||
|
compare_entry_clip_stacks,
|
||||||
|
_cogl_journal_flush_clip_stacks_and_entries,
|
||||||
|
state);
|
||||||
|
|
||||||
|
COGL_TIMER_STOP (_cogl_uprof_context, time_flush_dither_and_entries);
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
compare_entry_dither_states (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
|
||||||
|
{
|
||||||
|
return entry0->dither_enabled == entry1->dither_enabled;
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_cogl_journal_flush_viewport_and_entries (CoglJournalEntry *batch_start,
|
_cogl_journal_flush_viewport_and_entries (CoglJournalEntry *batch_start,
|
||||||
int batch_len,
|
int batch_len,
|
||||||
@ -1077,8 +1120,8 @@ _cogl_journal_flush_viewport_and_entries (CoglJournalEntry *batch_start,
|
|||||||
|
|
||||||
batch_and_call (batch_start,
|
batch_and_call (batch_start,
|
||||||
batch_len,
|
batch_len,
|
||||||
compare_entry_clip_stacks,
|
compare_entry_dither_states,
|
||||||
_cogl_journal_flush_clip_stacks_and_entries,
|
_cogl_journal_flush_dither_and_entries,
|
||||||
state);
|
state);
|
||||||
|
|
||||||
if (memcmp (batch_start->viewport, current_viewport, sizeof (float) * 4) != 0)
|
if (memcmp (batch_start->viewport, current_viewport, sizeof (float) * 4) != 0)
|
||||||
@ -1385,7 +1428,8 @@ _cogl_journal_flush (CoglJournal *journal)
|
|||||||
_cogl_framebuffer_flush_state (framebuffer,
|
_cogl_framebuffer_flush_state (framebuffer,
|
||||||
framebuffer,
|
framebuffer,
|
||||||
COGL_FRAMEBUFFER_STATE_ALL &
|
COGL_FRAMEBUFFER_STATE_ALL &
|
||||||
~(COGL_FRAMEBUFFER_STATE_VIEWPORT |
|
~(COGL_FRAMEBUFFER_STATE_DITHER |
|
||||||
|
COGL_FRAMEBUFFER_STATE_VIEWPORT |
|
||||||
COGL_FRAMEBUFFER_STATE_MODELVIEW |
|
COGL_FRAMEBUFFER_STATE_MODELVIEW |
|
||||||
COGL_FRAMEBUFFER_STATE_CLIP));
|
COGL_FRAMEBUFFER_STATE_CLIP));
|
||||||
|
|
||||||
@ -1602,6 +1646,7 @@ _cogl_journal_log_quad (CoglJournal *journal,
|
|||||||
|
|
||||||
clip_stack = _cogl_framebuffer_get_clip_stack (framebuffer);
|
clip_stack = _cogl_framebuffer_get_clip_stack (framebuffer);
|
||||||
entry->clip_stack = _cogl_clip_stack_ref (clip_stack);
|
entry->clip_stack = _cogl_clip_stack_ref (clip_stack);
|
||||||
|
entry->dither_enabled = cogl_framebuffer_get_dither_enabled (framebuffer);
|
||||||
|
|
||||||
cogl_framebuffer_get_viewport4fv (framebuffer, entry->viewport);
|
cogl_framebuffer_get_viewport4fv (framebuffer, entry->viewport);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user