From 9c679d06055cc62aa9209318705e87dc33fba4c8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 31 May 2015 16:07:01 -0700 Subject: [PATCH] glamor: Skip actual FBO setup in our glyph atlas. VC4 (and many GLES2 renderers) can't render to GL_ALPHA, so our pixmap would end up as GLAMOR_MEMORY and our dereference of the FBO would setfault. Instead, tell the pixmap creation that we don't need an FBO at all. Our glyph upload path was already glTexImage for non-a1, and a more general software fallback for a1 (since the glyph is also in system memory). Signed-off-by: Eric Anholt Reviewed-by: Keith Packard --- glamor/glamor_composite_glyphs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index 47bf64725..c30cbed21 100644 --- a/glamor/glamor_composite_glyphs.c +++ b/glamor/glamor_composite_glyphs.c @@ -112,7 +112,8 @@ glamor_glyph_atlas_init(ScreenPtr screen, struct glamor_glyph_atlas *atlas) PictFormatPtr format = atlas->format; atlas->atlas = glamor_create_pixmap(screen, glamor_priv->glyph_atlas_dim, - glamor_priv->glyph_atlas_dim, format->depth, 0); + glamor_priv->glyph_atlas_dim, format->depth, + GLAMOR_CREATE_FBO_NO_FBO); atlas->x = 0; atlas->y = 0; atlas->row_height = 0;