diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-17 18:50:13 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-04-23 10:32:34 -0700 |
| commit | f6abfece3e59fa8c2e14a61430133816837855f8 (patch) | |
| tree | 91e574674f070b77d68263b5bf34e9278b8dc692 | |
| parent | 707726b155a2a086d12e0a6abef7f1e59def5370 (diff) | |
glamor: Move a make_current before the first GL call entrypoint.
Fixes a usage of the wrong context with swrast GLX's GetImage entrypoint.
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
| -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) { |