summaryrefslogtreecommitdiff
path: root/gsk
diff options
context:
space:
mode:
authorTimm Bäder <mail@baedert.org>2018-04-12 11:02:46 +0200
committerTimm Bäder <mail@baedert.org>2018-04-14 11:47:02 +0200
commitadd82735bb63a8988affb162b935412f62c3893d (patch)
treec1e59e4cdfdc48ab78b4a7835712b95c85937774 /gsk
parentc18219c5a8ca32ebe4a7cd7d86409a9d2228b48f (diff)
downloadgtk+-add82735bb63a8988affb162b935412f62c3893d.tar.gz
gl renderer: Don't use texture ids in glBindFramebuffer calls
Diffstat (limited to 'gsk')
-rw-r--r--gsk/gl/gskglrenderer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 9a9ae2ea61..8afea1700e 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -2465,6 +2465,9 @@ gsk_gl_renderer_do_render (GskRenderer *renderer,
gsk_gl_renderer_add_render_ops (self, root, &render_op_builder);
+ /* We correctly reset the state everywhere */
+ g_assert_cmpint (render_op_builder.current_render_target, ==, texture_id);
+
/*g_message ("Ops: %u", self->render_ops->len);*/
/* Now actually draw things... */
@@ -2540,7 +2543,7 @@ gsk_gl_renderer_render_texture (GskRenderer *renderer,
gsk_gl_driver_end_frame (self->gl_driver);
/* Render the actual scene */
- gsk_gl_renderer_do_render (renderer, root, viewport, texture_id, 1);
+ gsk_gl_renderer_do_render (renderer, root, viewport, fbo_id, 1);
texture = gdk_gl_texture_new (self->gl_context,
texture_id,