From d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 13 Apr 2014 14:24:56 +0200
Subject: fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014

xserver          commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2
libxcb           commit 29e419c5840a1eeda3336a0802686ee723dcaab3
libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999
pixman           commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0
fontconfig       commit f44157c809d280e2a0ce87fb078fc4b278d24a67
mesa             commit 936dda08ee6d7b2be2b016bc06780e401088ec13
---
 xorg-server/glamor/glamor_polyfillrect.c | 123 -------------------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 xorg-server/glamor/glamor_polyfillrect.c

(limited to 'xorg-server/glamor/glamor_polyfillrect.c')

diff --git a/xorg-server/glamor/glamor_polyfillrect.c b/xorg-server/glamor/glamor_polyfillrect.c
deleted file mode 100644
index 1e361a44f..000000000
--- a/xorg-server/glamor/glamor_polyfillrect.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- * Copyright © 1998 Keith Packard
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include "glamor_priv.h"
-
-/** @file glamor_fillspans.c
- *
- * GC PolyFillRect implementation, taken straight from fb_fill.c
- */
-
-static Bool
-_glamor_poly_fill_rect(DrawablePtr drawable,
-                       GCPtr gc, int nrect, xRectangle *prect, Bool fallback)
-{
-    int fullX1, fullX2, fullY1, fullY2;
-    int xorg, yorg;
-    int n;
-    register BoxPtr pbox;
-    RegionPtr pClip = fbGetCompositeClip(gc);
-    Bool ret = FALSE;
-
-    xorg = drawable->x;
-    yorg = drawable->y;
-
-    while (nrect--) {
-        fullX1 = prect->x + xorg;
-        fullY1 = prect->y + yorg;
-        fullX2 = fullX1 + (int) prect->width;
-        fullY2 = fullY1 + (int) prect->height;
-
-        n = REGION_NUM_RECTS(pClip);
-        pbox = REGION_RECTS(pClip);
-        /*
-         * clip the rectangle to each box in the clip region
-         * this is logically equivalent to calling Intersect(),
-         * but rectangles may overlap each other here.
-         */
-        while (n--) {
-            int x1 = fullX1;
-            int x2 = fullX2;
-            int y1 = fullY1;
-            int y2 = fullY2;
-
-            if (pbox->x1 > x1)
-                x1 = pbox->x1;
-            if (pbox->x2 < x2)
-                x2 = pbox->x2;
-            if (pbox->y1 > y1)
-                y1 = pbox->y1;
-            if (pbox->y2 < y2)
-                y2 = pbox->y2;
-
-            pbox++;
-            if (x1 >= x2 || y1 >= y2)
-                continue;
-            if (!glamor_fill(drawable, gc, x1, y1, x2 - x1, y2 - y1, fallback)) {
-                nrect++;
-                goto fail;
-            }
-        }
-        prect++;
-    }
-    ret = TRUE;
-    goto done;
-
- fail:
-
-    if (!fallback && glamor_ddx_fallback_check_pixmap(drawable)
-        && glamor_ddx_fallback_check_gc(gc))
-        goto done;
-
-    glamor_fallback(" to %p (%c)\n",
-                    drawable, glamor_get_drawable_location(drawable));
-    if (glamor_prepare_access(drawable, GLAMOR_ACCESS_RW) &&
-        glamor_prepare_access_gc(gc)) {
-        fbPolyFillRect(drawable, gc, nrect, prect);
-    }
-    glamor_finish_access_gc(gc);
-    glamor_finish_access(drawable);
-    ret = TRUE;
-
- done:
-    return ret;
-}
-
-void
-glamor_poly_fill_rect(DrawablePtr drawable,
-                      GCPtr gc, int nrect, xRectangle *prect)
-{
-    _glamor_poly_fill_rect(drawable, gc, nrect, prect, TRUE);
-}
-
-Bool
-glamor_poly_fill_rect_nf(DrawablePtr drawable,
-                         GCPtr gc, int nrect, xRectangle *prect)
-{
-    return _glamor_poly_fill_rect(drawable, gc, nrect, prect, FALSE);
-}
-- 
cgit v1.2.3