isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Add new 'sync-{primitive,frame}' options for COGL_DEBUG

Browse Source 
This allows profilers to trace the callers of whatever is spending the
most time on the GPU, and to measure render times more accurately.
Previously such information was hidden as it completed in the
background (asynchronously) after we call swap buffers.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1327>
This commit is contained in:
Daniel van Vugt 2020-06-23 18:03:54 +08:00 committed by Marge Bot
parent f78cfc0c80
commit a793b4eef5
5 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cogl/cogl/cogl-debug-options.h
View File

@ -171,3 +171,16 @@ OPT (PERFORMANCE,
"performance", "performance",
N_("Trace performance concerns"), N_("Trace performance concerns"),
N_("Tries to highlight sub-optimal Cogl usage.")) N_("Tries to highlight sub-optimal Cogl usage."))
OPT (SYNC_PRIMITIVE,
N_("Root Cause"),
"sync-primitive",
N_("Render primitives synchronously"),
N_("Call glFinish after rendering each primitive, so profilers can see "
"the call stack of what's incurring most of the render time."))
OPT (SYNC_FRAME,
N_("Root Cause"),
"sync-frame",
N_("Render frames synchronously"),
N_("Call glFinish after rendering each frame, so profilers can measure "
"the total render time (as a portion of the stage update time) more "
"accurately."))

4
cogl/cogl/cogl-debug.c
View File

@ -80,7 +80,9 @@ static const GDebugKey cogl_behavioural_debug_keys[] = {
{ "wireframe", COGL_DEBUG_WIREFRAME}, { "wireframe", COGL_DEBUG_WIREFRAME},
{ "disable-software-clip", COGL_DEBUG_DISABLE_SOFTWARE_CLIP}, { "disable-software-clip", COGL_DEBUG_DISABLE_SOFTWARE_CLIP},
{ "disable-program-caches", COGL_DEBUG_DISABLE_PROGRAM_CACHES}, { "disable-program-caches", COGL_DEBUG_DISABLE_PROGRAM_CACHES},
{ "disable-fast-read-pixel", COGL_DEBUG_DISABLE_FAST_READ_PIXEL} { "disable-fast-read-pixel", COGL_DEBUG_DISABLE_FAST_READ_PIXEL},
{ "sync-primitive", COGL_DEBUG_SYNC_PRIMITIVE },
{ "sync-frame", COGL_DEBUG_SYNC_FRAME},
}; };
static const int n_cogl_behavioural_debug_keys = static const int n_cogl_behavioural_debug_keys =
G_N_ELEMENTS (cogl_behavioural_debug_keys); G_N_ELEMENTS (cogl_behavioural_debug_keys);

2
cogl/cogl/cogl-debug.h
View File

@ -71,6 +71,8 @@ typedef enum
COGL_DEBUG_CLIPPING, COGL_DEBUG_CLIPPING,
COGL_DEBUG_WINSYS, COGL_DEBUG_WINSYS,
COGL_DEBUG_PERFORMANCE, COGL_DEBUG_PERFORMANCE,
COGL_DEBUG_SYNC_PRIMITIVE,
COGL_DEBUG_SYNC_FRAME,
COGL_DEBUG_N_FLAGS COGL_DEBUG_N_FLAGS
} CoglDebugFlags; } CoglDebugFlags;

9
cogl/cogl/cogl-journal.c
View File

@ -1629,8 +1629,15 @@ _cogl_journal_log_quad (CoglJournal *journal,
add_framebuffer_deps_cb, add_framebuffer_deps_cb,
framebuffer); framebuffer);
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_BATCHING))) if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_SYNC_PRIMITIVE)))
{
_cogl_journal_flush (journal); _cogl_journal_flush (journal);
cogl_framebuffer_finish (framebuffer);
}
else if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_BATCHING)))
{
_cogl_journal_flush (journal);
}
COGL_TIMER_STOP (_cogl_uprof_context, log_timer); COGL_TIMER_STOP (_cogl_uprof_context, log_timer);
} }

6
cogl/cogl/cogl-onscreen.c
View File

@ -315,6 +315,9 @@ cogl_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
_cogl_framebuffer_flush_journal (framebuffer); _cogl_framebuffer_flush_journal (framebuffer);
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_SYNC_FRAME)))
cogl_framebuffer_finish (framebuffer);
winsys = _cogl_framebuffer_get_winsys (framebuffer); winsys = _cogl_framebuffer_get_winsys (framebuffer);
winsys->onscreen_swap_buffers_with_damage (onscreen, winsys->onscreen_swap_buffers_with_damage (onscreen,
rectangles, n_rectangles, rectangles, n_rectangles,
@ -364,6 +367,9 @@ cogl_onscreen_swap_region (CoglOnscreen *onscreen,
_cogl_framebuffer_flush_journal (framebuffer); _cogl_framebuffer_flush_journal (framebuffer);
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_SYNC_FRAME)))
cogl_framebuffer_finish (framebuffer);
winsys = _cogl_framebuffer_get_winsys (framebuffer); winsys = _cogl_framebuffer_get_winsys (framebuffer);
/* This should only be called if the winsys advertises /* This should only be called if the winsys advertises