From c47ee880e742e15fdbd5f5ac3eba64db6228c09f Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 11 Aug 2014 15:23:02 -0700
Subject: [PATCH] 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>
---
glamor/glamor_font.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/glamor/glamor_font.c b/glamor/glamor_font.c
index 57c607dc20..0ca91fa2ee 100644
--- a/glamor/glamor_font.c
+++ b/glamor/glamor_font.c
@@ -46,6 +46,8 @@ glamor_font_get(ScreenPtr screen, FontPtr font)
CharInfoPtr glyph;
unsigned long count;
+ if (glamor_priv->glsl_version < 130)
+ return NULL;
privates = FontGetPrivate(font, glamor_font_private_index);
if (!privates) {
@@ -167,6 +169,11 @@ glamor_unrealize_font(ScreenPtr screen, FontPtr font)
Bool
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) {
glamor_font_private_index = AllocateFontPrivateIndex();
if (glamor_font_private_index == -1)
--
GitLab