frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Don't try to set up core fonts textures when we won't use them. 

This happens to avoid GL errors on hardware without
EXT_texture_integer (which implies < GLSL 130, and thus glamor_text.c
programs not compiling anyway).

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-08-11 15:23:02 -07:00 committed by Keith Packard
parent d09c9ddb86
commit c47ee880e7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glamor/glamor_font.c
View File

@ -46,6 +46,8 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
CharInfoPtr glyph; CharInfoPtr glyph;
unsigned long count; unsigned long count;
if (glamor_priv->glsl_version < 130)
return NULL;
privates = FontGetPrivate(font, glamor_font_private_index); privates = FontGetPrivate(font, glamor_font_private_index);
if (!privates) { if (!privates) {
@ -167,6 +169,11 @@ glamor_unrealize_font(ScreenPtr screen, FontPtr font)
Bool Bool
glamor_font_init(ScreenPtr screen) glamor_font_init(ScreenPtr screen)
{ {
glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
if (glamor_priv->glsl_version < 130)
return TRUE;
if (glamor_font_generation != serverGeneration) { if (glamor_font_generation != serverGeneration) {
glamor_font_private_index = AllocateFontPrivateIndex(); glamor_font_private_index = AllocateFontPrivateIndex();
if (glamor_font_private_index == -1) if (glamor_font_private_index == -1)