From 20bcda977755559294c3a951f80af2ec861595fc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 6 Jan 2014 06:53:46 +0800 Subject: [PATCH] glamor: Drop bogus _X_UNLIKELY. nbox > 4 is actually quite common for spans handling. Signed-off-by: Eric Anholt Reviewed-by: Markus Wick --- glamor/glamor_fill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor/glamor_fill.c b/glamor/glamor_fill.c index 75c952ca1..aaa778300 100644 --- a/glamor/glamor_fill.c +++ b/glamor/glamor_fill.c @@ -200,7 +200,7 @@ _glamor_solid_boxes(PixmapPtr pixmap, BoxPtr box, int nbox, float *color) pixmap_priv_get_dest_scale(pixmap_priv, &xscale, &yscale); - if (_X_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) {