Fixes epoxy assertion failures on vc4.
Signed-off-by: Eric Anholt <[email protected]>
---
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 c30cbed..1f0d75e 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);
}
--
2.1.4
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
