Merge branch 'glamor-fix-potential-bo-race' into 'master'

glamor: Force to flush when copying an exporting pixmap

See merge request xorg/xserver!1706
This commit is contained in:
Luc Ma 2026-01-24 15:49:51 +00:00
commit 6757dca6df

View file

@ -359,6 +359,11 @@ glamor_make_pixmap_exportable(PixmapPtr pixmap, Bool modifiers_ok)
0, 0, width, height, 0, 0);
FreeScratchGC(scratch_gc);
/* In case that the pixmap backing BO importer's command stream accidentally
* gets flushed first.
*/
glFlush();
/* Now, swap the tex/gbm/EGLImage/etc. of the exported pixmap into
* the original pixmap struct.
*/