summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-07-15 17:56:11 +1000
committerEric Anholt <eric@anholt.net>2015-07-16 10:57:00 -0700
commitdb5337afb248edf81087cf8d74006fc496d70589 (patch)
tree8fdc519ea9e5c759b73b211221957edc54c6d292
parent1a18513a4eb3fa22459dd9f7d8f0e275aff679ec (diff)
glamor: make current in prepare paths
Lots of the accel paths only make current once they start doing someting, so a lot of them call the bail paths without make current, which means on PRIME systems for example we end up in the wrong context. Add a prepare pixmap in the prepare fallback path. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90667 Signed-off-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Eric Anholt <eric@anholt.net>
-rw-r--r--glamor/glamor_prepare.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
index 833291c58..5a73e6c7d 100644
--- a/glamor/glamor_prepare.c
+++ b/glamor/glamor_prepare.c
@@ -45,6 +45,8 @@ glamor_prep_pixmap_box(PixmapPtr pixmap, glamor_access_t access, BoxPtr box)
if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(priv))
return TRUE;
+ glamor_make_current(glamor_priv);
+
RegionInit(&region, box, 1);
/* See if it's already mapped */