AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 06:51:10 +00:00
Code Issues Projects Releases Wiki Activity

ngl: Fix crash at startup

Browse Source 
Commit 1580490670 included a reordering of
acquiring the frame before making the context current.

Sometimes (like at startup) new frames need to be created.

Setting up a new frame assumed the GL context was current.

Change it so that we delay the one GL setup we do in frames until later.
This commit is contained in:
Benjamin Otte 2024-07-19 21:33:53 +02:00
parent 0e0158a825
commit 2a9056b49e
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gsk/gpu/gskglframe.c
View File

@ -54,14 +54,6 @@ gsk_gl_frame_wait (GskGpuFrame *frame)
glClientWaitSync (self->sync, 0, G_MAXINT64);
}
static void
gsk_gl_frame_setup (GskGpuFrame *frame)
{
GskGLFrame *self = GSK_GL_FRAME (frame);
glGenBuffers (1, &self->globals_buffer_id);
}
static void
gsk_gl_frame_cleanup (GskGpuFrame *frame)
{
@ -207,7 +199,8 @@ gsk_gl_frame_finalize (GObject *object)
GskGLFrame *self = GSK_GL_FRAME (object);
g_hash_table_unref (self->vaos);
glDeleteBuffers (1, &self->globals_buffer_id);
if (self->globals_buffer_id != 0)
glDeleteBuffers (1, &self->globals_buffer_id);
G_OBJECT_CLASS (gsk_gl_frame_parent_class)->finalize (object);
}
@ -220,7 +213,6 @@ gsk_gl_frame_class_init (GskGLFrameClass *klass)
gpu_frame_class->is_busy = gsk_gl_frame_is_busy;
gpu_frame_class->wait = gsk_gl_frame_wait;
gpu_frame_class->setup = gsk_gl_frame_setup;
gpu_frame_class->cleanup = gsk_gl_frame_cleanup;
gpu_frame_class->upload_texture = gsk_gl_frame_upload_texture;
gpu_frame_class->create_descriptors = gsk_gl_frame_create_descriptors;
@ -276,6 +268,9 @@ gsk_gl_frame_use_program (GskGLFrame *self,
void
gsk_gl_frame_bind_globals (GskGLFrame *self)
{
if (self->globals_buffer_id == 0)
glGenBuffers (1, &self->globals_buffer_id);
glBindBufferBase (GL_UNIFORM_BUFFER, 0, self->globals_buffer_id);
}