sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl: Update latest sync fd also from cogl_gl_framebuffer_flush/finish

Browse source 
This ensures that any drawing for screen casting is reflected in the
sync fd.

Fixes: 99209958b9 ("cogl: Store latest GPU work completed sync fd")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3946>
This commit is contained in:
Michel Dänzer 2024-07-04 18:07:21 +02:00 committed by Marge Bot
parent f2642dbc31
commit 61ae9eedb6
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cogl/cogl/cogl-onscreen.c
View file

@ -291,11 +291,10 @@ cogl_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
_cogl_framebuffer_flush_journal (framebuffer); _cogl_framebuffer_flush_journal (framebuffer);
/* Update our "latest" sync fd to contain all previous work */
_cogl_context_update_sync (context);
if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_SYNC_FRAME))) if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_SYNC_FRAME)))
cogl_framebuffer_finish (framebuffer); cogl_framebuffer_finish (framebuffer);
else
_cogl_context_update_sync (context);
cogl_framebuffer_discard_buffers (framebuffer, cogl_framebuffer_discard_buffers (framebuffer,
COGL_BUFFER_BIT_DEPTH | COGL_BUFFER_BIT_DEPTH |

6
cogl/cogl/driver/gl/cogl-framebuffer-gl.c
View file

@ -294,6 +294,9 @@ cogl_gl_framebuffer_finish (CoglFramebufferDriver *driver)
{ {
CoglContext *ctx = context_from_driver (driver); CoglContext *ctx = context_from_driver (driver);
/* Update our "latest" sync fd to contain all previous work */
_cogl_context_update_sync (ctx);
ctx->glFinish (); ctx->glFinish ();
} }
@ -302,6 +305,9 @@ cogl_gl_framebuffer_flush (CoglFramebufferDriver *driver)
{ {
CoglContext *ctx = context_from_driver (driver); CoglContext *ctx = context_from_driver (driver);
/* Update our "latest" sync fd to contain all previous work */
_cogl_context_update_sync (ctx);
ctx->glFlush (); ctx->glFlush ();
} }