diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
index e92f1d916..cd88524df 100644
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@@ -64,45 +64,58 @@ glamor_copy_glyph(PixmapPtr     glyph_pixmap,
         .x2 = glyph_draw->width,
         .y2 = glyph_draw->height,
     };
+    PixmapPtr upload_pixmap = glyph_pixmap;
 
-    if (glyph_pixmap->drawable.bitsPerPixel == atlas_draw->bitsPerPixel) {
-        glamor_upload_boxes((PixmapPtr) atlas_draw,
-                            &box, 1,
-                            0, 0,
-                            x, y,
-                            glyph_pixmap->devPrivate.ptr,
-                            glyph_pixmap->devKind);
-    } else {
-        GCPtr scratch_gc = GetScratchGC(atlas_draw->depth, atlas_draw->pScreen);
-        ChangeGCVal changes[2];
-        if (!scratch_gc)
+    if (glyph_pixmap->drawable.bitsPerPixel != atlas_draw->bitsPerPixel) {
+
+        /* If we're dealing with 1-bit glyphs, we copy them to a
+         * temporary 8-bit pixmap and upload them from there, since
+         * that's what GL can handle.
+         */
+        ScreenPtr       screen = atlas_draw->pScreen;
+        GCPtr           scratch_gc;
+        ChangeGCVal     changes[2];
+
+        upload_pixmap = glamor_create_pixmap(screen,
+                                             glyph_draw->width,
+                                             glyph_draw->height,
+                                             atlas_draw->depth,
+                                             GLAMOR_CREATE_PIXMAP_CPU);
+        if (!upload_pixmap)
             return;
 
-        /* If we're dealing with 1-bit glyphs, we upload them to
-         * the cache as normal 8-bit alpha, since that's what GL
-         * can handle.
-         */
-        assert(glyph_draw->depth == 1);
-        assert(atlas_draw->depth == 8);
-
+        scratch_gc = GetScratchGC(upload_pixmap->drawable.depth, screen);
+        if (!scratch_gc) {
+            glamor_destroy_pixmap(upload_pixmap);
+            return;
+        }
         changes[0].val = 0xff;
         changes[1].val = 0x00;
         if (ChangeGC(NullClient, scratch_gc,
-                     GCForeground|GCBackground, changes) != Success)
-            goto bail_gc;
-        ValidateGC(atlas_draw, scratch_gc);
+                     GCForeground|GCBackground, changes) != Success) {
+            glamor_destroy_pixmap(upload_pixmap);
+            FreeScratchGC(scratch_gc);
+            return;
+        }
+        ValidateGC(&upload_pixmap->drawable, scratch_gc);
 
         (*scratch_gc->ops->CopyPlane)(glyph_draw,
-                                      atlas_draw,
+                                      &upload_pixmap->drawable,
                                       scratch_gc,
                                       0, 0,
                                       glyph_draw->width,
                                       glyph_draw->height,
-                                      x, y, 0x1);
-
-    bail_gc:
-        FreeScratchGC(scratch_gc);
+                                      0, 0, 0x1);
     }
+    glamor_upload_boxes((PixmapPtr) atlas_draw,
+                        &box, 1,
+                        0, 0,
+                        x, y,
+                        upload_pixmap->devPrivate.ptr,
+                        upload_pixmap->devKind);
+
+    if (upload_pixmap != glyph_pixmap)
+        glamor_destroy_pixmap(upload_pixmap);
 }
 
 static Bool