diff options
| author | Keith Packard <keithp@keithp.com> | 2016-05-14 08:22:17 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2016-05-26 09:17:59 -0700 |
| commit | b07bc700b3cf2f5c8912fc5b9e0dad2baf395525 (patch) | |
| tree | 95ff6c2fcf6d3b59fcbee5a0bcca172ace65f0d1 /glamor | |
| parent | 743b6f231e999d8b2909228412266dc13cc433c5 (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>
Diffstat (limited to 'glamor')
| -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 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); |