From 790311cec30ac3d35e580b9f1266236f558033d4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 31 May 2015 16:08:10 -0700 Subject: [PATCH] glamor: Don't try to disable attrib divisors without the extension. Fixes epoxy assertion failures on vc4. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard --- glamor/glamor_composite_glyphs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c index c30cbed21..1f0d75ede 100644 --- a/glamor/glamor_composite_glyphs.c +++ b/glamor/glamor_composite_glyphs.c @@ -266,9 +266,11 @@ glamor_glyphs_flush(CARD8 op, PicturePtr src, PicturePtr dst, glDisable(GL_SCISSOR_TEST); - glVertexAttribDivisor(GLAMOR_VERTEX_SOURCE, 0); + if (glamor_glyph_use_130(glamor_priv)) { + glVertexAttribDivisor(GLAMOR_VERTEX_SOURCE, 0); + glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0); + } glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); - glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0); glDisableVertexAttribArray(GLAMOR_VERTEX_POS); glDisable(GL_BLEND); }