diff options
| author | Eric Anholt <eric@anholt.net> | 2015-05-31 16:08:10 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-06-18 10:39:14 -0700 |
| commit | 0ec47a2cbdbb3879d3f692f0a79c8b725b169835 (patch) | |
| tree | 123e06245dd990391810d7730b1fda790add5ce1 | |
| parent | 6890ea8b8ee8e7c6e6b767a93bbfea48f21861e1 (diff) | |
glamor: Don't try to disable attrib divisors without the extension.
Fixes epoxy assertion failures on vc4.
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | glamor/glamor_composite_glyphs.c | 6 |
1 files 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); } |