From b07bc700b3cf2f5c8912fc5b9e0dad2baf395525 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 May 2016 08:22:17 -0700 Subject: [PATCH] glamor: glamor_make_current sooner in glamor_composite_with_shader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit glamor_make_current is supposed to be called before any GL APIs. Signed-off-by: Keith Packard Reviewed-by: Michel Dänzer --- glamor/glamor_render.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index aa3a56694..a67965e1c 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -1154,12 +1154,12 @@ glamor_composite_with_shader(CARD8 op, } } + glamor_make_current(glamor_priv); + glamor_set_destination_pixmap_priv_nc(glamor_priv, dest_pixmap, dest_pixmap_priv); glamor_composite_set_shader_blend(glamor_priv, dest_pixmap_priv, &key, shader, &op_info); glamor_set_alu(screen, GXcopy); - glamor_make_current(glamor_priv); - glamor_priv->has_source_coords = key.source != SHADER_SOURCE_SOLID; glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE && key.mask != SHADER_MASK_SOLID);