xserver: Branch 'master'
Eric Anholt
anholt at kemper.freedesktop.org
Fri Sep 30 16:57:29 UTC 2016
glamor/glamor_spans.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9b8ce73927a43ed82b267d1c1985445f24827cc
Author: Mark Yao <mark.yao at rock-chips.com>
Date: Fri Sep 30 16:42:35 2016 +0800
glamor: spans: fixup wrong count on glDrawArrays
In commit 9e9fcf5 (glamor: Add a helper function for the common
GL_QUADS fallback pattern.), the glDrawArrays count change was
accidentally changed to nbox.
Fixes xlogo with MESA_GL_VERSION_OVERRIDE=2.1 and
MESA_GLSL_VERSION_OVERRIDE=120
Signed-off-by: Mark Yao <mark.yao at rock-chips.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
diff --git a/glamor/glamor_spans.c b/glamor/glamor_spans.c
index 5217d04..9a2aecd 100644
--- a/glamor/glamor_spans.c
+++ b/glamor/glamor_spans.c
@@ -135,7 +135,7 @@ glamor_fill_spans_gl(DrawablePtr drawable,
if (glamor_priv->glsl_version >= 130)
glDrawArraysInstanced(GL_TRIANGLE_STRIP, 0, 4, n);
else {
- glamor_glDrawArrays_GL_QUADS(glamor_priv, nbox);
+ glamor_glDrawArrays_GL_QUADS(glamor_priv, n);
}
}
}
More information about the xorg-commit
mailing list