[PATCH 11/27] glamor: Drop bogus _X_UNLIKELY.

Eric Anholt eric at anholt.net
Tue Mar 11 14:30:25 PDT 2014


nbox > 4 is actually quite common for spans handling.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 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 75c952c..aaa7783 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) {
-- 
1.9.0



More information about the xorg-devel mailing list