fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-10 12:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

glamor: glamor_make_current sooner in glamor_composite_with_shader

Browse source 
glamor_make_current is supposed to be called before any GL APIs.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
(cherry picked from commit b07bc700b3)
This commit is contained in:
Keith Packard 2016-05-14 08:22:17 -07:00 • committed by Adam Jackson
parent e63e9b8f19
commit 0c9a6d4093
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glamor/glamor_render.c
View file

@ -1159,12 +1159,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);