diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-17 18:50:13 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-17 18:50:13 -0700 |
| commit | 163acd3f309d3cbeaa93a13c66f1001e7b3f3e5e (patch) | |
| tree | 5c7d8822a20940c8d262d6ff8a2a742b32513bc5 | |
| parent | e22e3771f80236cd7b00f2e47cdcd0868584ec28 (diff) | |
glamor: Move a make_current before the first GL call entrypoint.glamor-xephyr-gl-context
Fixes a usage of the wrong context with swrast GLX's GetImage entrypoint.
| -rw-r--r-- | glamor/glamor_pixmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 371e486b5..54b414bc2 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -1217,6 +1217,7 @@ _glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, GLenum format, assert(0); } + glamor_make_current(glamor_priv); glamor_set_destination_pixmap_priv_nc(pixmap_priv); need_post_conversion = (revert > REVERT_NORMAL); @@ -1249,7 +1250,6 @@ _glamor_download_sub_pixmap_to_cpu(PixmapPtr pixmap, GLenum format, fbo_y_off = 0; } - glamor_make_current(glamor_priv); glPixelStorei(GL_PACK_ALIGNMENT, 4); if (glamor_priv->has_pack_invert || glamor_priv->yInverted) { |