diff options
| author | Alexander Larsson <alexl@redhat.com> | 2019-04-29 11:42:04 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2019-04-29 11:42:04 +0000 |
| commit | 484e330e4a952a4667b4d5cb04e70452530ae707 (patch) | |
| tree | 26ebf787bd4f6796c255f54f44a1db47f9cb559b /gsk | |
| parent | f27ecde1e28c9aef7fe3b6aca2ac9c519d300e51 (diff) | |
| parent | 931b0b3752367a0651ad94d6ac0e2a1571012d2d (diff) | |
| download | gtk+-484e330e4a952a4667b4d5cb04e70452530ae707.tar.gz | |
Merge branch 'wip/baedert/fix-gl-debug' into 'master'
Fix GL debugging
See merge request GNOME/gtk!778
Diffstat (limited to 'gsk')
| -rw-r--r-- | gsk/gl/gskgldriver.c | 5 | ||||
| -rw-r--r-- | gsk/gl/gskglrenderer.c | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c index 95351cd051..dfccd315fc 100644 --- a/gsk/gl/gskgldriver.c +++ b/gsk/gl/gskgldriver.c @@ -535,8 +535,6 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self, } t = create_texture (self, gdk_texture_get_width (texture), gdk_texture_get_height (texture)); - gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, t->texture_id, - "GdkTexture<%p> %d", texture, t->texture_id); if (gdk_texture_set_render_data (texture, self, t, gsk_gl_driver_release_texture)) t->user = texture; @@ -547,6 +545,9 @@ gsk_gl_driver_get_texture_for_texture (GskGLDriver *self, surface, min_filter, mag_filter); + gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, t->texture_id, + "GdkTexture<%p> %d", texture, t->texture_id); + cairo_surface_destroy (surface); return t->texture_id; diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index cfe0e02648..93a9765c35 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -480,14 +480,14 @@ render_fallback_node (GskGLRenderer *self, texture_id = gsk_gl_driver_create_texture (self->gl_driver, surface_width, surface_height); - gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id, - "Fallback %s %d", node->node_class->type_name, texture_id); - gsk_gl_driver_bind_source_texture (self->gl_driver, texture_id); gsk_gl_driver_init_texture_with_surface (self->gl_driver, texture_id, surface, GL_NEAREST, GL_NEAREST); + gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id, + "Fallback %s %d", node->node_class->type_name, texture_id); + cairo_surface_destroy (surface); @@ -1432,10 +1432,10 @@ render_outset_shadow_node (GskGLRenderer *self, GskRoundedRect blit_clip; texture_id = gsk_gl_driver_create_texture (self->gl_driver, texture_width, texture_height); - gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id, - "Outset Shadow Temp %d", texture_id); gsk_gl_driver_bind_source_texture (self->gl_driver, texture_id); gsk_gl_driver_init_texture_empty (self->gl_driver, texture_id); + gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id, + "Outset Shadow Temp %d", texture_id); render_target = gsk_gl_driver_create_render_target (self->gl_driver, texture_id, FALSE, FALSE); gdk_gl_context_label_object_printf (self->gl_context, GL_FRAMEBUFFER, render_target, "Outset Shadow FB Temp %d", render_target); @@ -1469,10 +1469,10 @@ render_outset_shadow_node (GskGLRenderer *self, }); blurred_texture_id = gsk_gl_driver_create_permanent_texture (self->gl_driver, texture_width, texture_height); - gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, blurred_texture_id, - "Outset Shadow Cache %d", blurred_texture_id); gsk_gl_driver_bind_source_texture (self->gl_driver, blurred_texture_id); gsk_gl_driver_init_texture_empty (self->gl_driver, blurred_texture_id); + gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, blurred_texture_id, + "Outset Shadow Cache %d", blurred_texture_id); blurred_render_target = gsk_gl_driver_create_render_target (self->gl_driver, blurred_texture_id, TRUE, TRUE); gdk_gl_context_label_object_printf (self->gl_context, GL_FRAMEBUFFER, render_target, "Outset Shadow Cache FB %d", render_target); |