summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-04-17 18:50:13 -0700
committerEric Anholt <eric@anholt.net>2014-04-22 12:29:38 -0700
commite119db5eb70ee790a25b88e7f25ca6762751ff6f (patch)
tree48f69f80b3ff400b6305ba1789743447407f3407
parenta0c5e9af9ee1c796c06d7098bd0c16727a9bb0e4 (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.
-rw-r--r--glamor/glamor_pixmap.c2
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) {