diff options
| author | Keith Packard <keithp@keithp.com> | 2016-05-14 08:22:17 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-06 13:21:27 -0400 |
| commit | 0c9a6d4093d6cdfadecb9a703cfb090e43ccf6aa (patch) | |
| tree | 5d671bef82d4f5c143d894f23aa726d54a9327b0 | |
| parent | e63e9b8f197889b6c162ba36988d6e5656cb0c10 (diff) | |
glamor: glamor_make_current sooner in glamor_composite_with_shader
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 b07bc700b3cf2f5c8912fc5b9e0dad2baf395525)
| -rw-r--r-- | glamor/glamor_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 8bdccd96d..186ae1755 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -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); |