AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'gl-renderer-more-defensive' into 'main'

Browse Source 
gsk: Stop setting uniforms when we are out of batches

See merge request GNOME/gtk!5981
This commit is contained in:
Matthias Clasen 2023-05-17 00:29:40 +00:00
commit 2ec1bd7248
3 changed files with 962 additions and 886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gsk/gl/gskglcommandqueue.c
View File

@ -579,7 +579,7 @@ discard_batch (GskGLCommandQueue *self)
self->batches.len--; self->batches.len--;
} }
void gboolean
gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self, gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self,
GskGLUniformProgram *program, GskGLUniformProgram *program,
guint width, guint width,
@ -596,7 +596,7 @@ gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self,
* of batches we can have in one frame. * of batches we can have in one frame.
*/ */
if (will_ignore_batch (self)) if (will_ignore_batch (self))
return; return FALSE;
self->program_info = program; self->program_info = program;
@ -617,6 +617,8 @@ gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self,
self->fbo_max = MAX (self->fbo_max, batch->draw.framebuffer); self->fbo_max = MAX (self->fbo_max, batch->draw.framebuffer);
self->in_draw = TRUE; self->in_draw = TRUE;
return TRUE;
} }
void void

2
gsk/gl/gskglcommandqueueprivate.h
View File

@ -331,7 +331,7 @@ void gsk_gl_command_queue_delete_program (GskGLCommandQueue
void gsk_gl_command_queue_clear (GskGLCommandQueue *self, void gsk_gl_command_queue_clear (GskGLCommandQueue *self,
guint clear_bits, guint clear_bits,
const graphene_rect_t *viewport); const graphene_rect_t *viewport);
void gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self, gboolean gsk_gl_command_queue_begin_draw (GskGLCommandQueue *self,
GskGLUniformProgram *program_info, GskGLUniformProgram *program_info,
guint width, guint width,
guint height); guint height);

1840
gsk/gl/gskglrenderjob.c
View File

File diff suppressed because it is too large Load Diff