diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-11-16 19:20:19 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-11-16 19:20:19 +0000 |
| commit | 1bb4e660fd4a9572dbe15a9f5ea342525bea0924 (patch) | |
| tree | 0b108c283bf14aaaf5ad45f3298b7dbea5778872 | |
| parent | ded6ec642446a5accc30b0cf8191e0d8c5bfe646 (diff) | |
| parent | 12a91644148a230aecab895f575e30f3e58576b0 (diff) | |
| download | gtk+-1bb4e660fd4a9572dbe15a9f5ea342525bea0924.tar.gz | |
Merge branch 'wip/chergert/for-master' into 'master'
gsk: use glFrameBufferTexture2D and release texture
See merge request GNOME/gtk!2842
| -rw-r--r-- | gsk/gl/gskglrenderer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c index a40df3c94e..15bad5feaa 100644 --- a/gsk/gl/gskglrenderer.c +++ b/gsk/gl/gskglrenderer.c @@ -4303,7 +4303,7 @@ gsk_gl_renderer_render_texture (GskRenderer *renderer, glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - glFramebufferTexture (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, final_texture_id, 0); + glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, final_texture_id, 0); g_assert_cmphex (glCheckFramebufferStatus (GL_FRAMEBUFFER), ==, GL_FRAMEBUFFER_COMPLETE); ops_set_render_target (&self->op_builder, final_fbo_id); @@ -4324,6 +4324,9 @@ gsk_gl_renderer_render_texture (GskRenderer *renderer, gsk_gl_renderer_render_ops (self); ops_finish (&self->op_builder); + + glDeleteTextures (1, &texture_id); + texture_id = final_texture_id; } |