diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-16 22:20:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-16 22:20:51 +0000 |
| commit | 1b885cc317156f215d79c415828f42db1ef143af (patch) | |
| tree | c296641598ae1b4604525c68681bd092ff303237 | |
| parent | 0bbc6f89324e1caa0c8c1919f1b9d4133a59223b (diff) | |
| parent | 9dd83ab354c03c5dba2e0111245e67cf77d3edfd (diff) | |
| download | gtk+-1b885cc317156f215d79c415828f42db1ef143af.tar.gz | |
Merge branch 'fix-gsk-assertions' into 'main'
gsk: Fix a crash
See merge request GNOME/gtk!5979
| -rw-r--r-- | gsk/gl/gskglcommandqueue.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gsk/gl/gskglcommandqueue.c b/gsk/gl/gskglcommandqueue.c index e7af501582..6c6a27ca88 100644 --- a/gsk/gl/gskglcommandqueue.c +++ b/gsk/gl/gskglcommandqueue.c @@ -721,6 +721,10 @@ gsk_gl_command_queue_split_draw (GskGLCommandQueue *self) g_assert (GSK_IS_GL_COMMAND_QUEUE (self)); g_assert (self->batches.len > 0); + + if (will_ignore_batch (self)) + return; + g_assert (self->in_draw == TRUE); program = self->program_info; |