diff options
| author | Eric Anholt <eric@anholt.net> | 2015-05-31 16:07:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-06-19 19:11:03 -0700 |
| commit | 9c679d06055cc62aa9209318705e87dc33fba4c8 (patch) | |
| tree | a50dfea7a407157b27cfbe8212f3407fb4e04e7b /glamor/glamor_composite_glyphs.c | |
| parent | 077bb1bdea0fa9af846c02896df680293cf9e25c (diff) | |
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 <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'glamor/glamor_composite_glyphs.c')
| -rw-r--r-- | glamor/glamor_composite_glyphs.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |