[Glamor] [PATCH 13/34] glamor: Drop bogus _X_UNLIKELY.
Alex Deucher
alexdeucher at gmail.com
Fri Feb 28 10:02:08 PST 2014
From: Eric Anholt <eric at anholt.net>
nbox > 4 is actually quite common for spans handling.
Ported from Eric's xserver glamor tree.
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
src/glamor_fill.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/glamor_fill.c b/src/glamor_fill.c
index fbc8739..4eb23cd 100644
--- a/src/glamor_fill.c
+++ b/src/glamor_fill.c
@@ -204,7 +204,7 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color)
pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale);
- if (unlikely(nbox*4*2 > ARRAY_SIZE(vertices))) {
+ if (nbox * 4 * 2 > ARRAY_SIZE(vertices)) {
int allocated_box;
if (nbox * 6 > GLAMOR_COMPOSITE_VBO_VERT_CNT) {
--
1.8.3.1
More information about the Glamor
mailing list