diff options
author | Keith Packard <keithp@keithp.com> | 2014-03-22 15:20:49 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2014-03-26 12:58:40 -0700 |
commit | 72a4beff6d3aed767df9a30bca0c1d860715928f (patch) | |
tree | e0c45f21967fc71dabb3a29b338a40926005604b | |
parent | 029b64c30a8bdf87edfdb1c988f4e8dcee1bb4ef (diff) |
glamor: Move glamor_poly_segment to separate glamor_segment.c file
There's no reason to mix PolyPoint and PolySegment in the same file.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r-- | glamor/Makefile.am | 1 | ||||
-rw-r--r-- | glamor/glamor_polyops.c | 26 | ||||
-rw-r--r-- | glamor/glamor_segment.c | 39 |
3 files changed, 40 insertions, 26 deletions
diff --git a/glamor/Makefile.am b/glamor/Makefile.am index dec6467fd..eff769eff 100644 --- a/glamor/Makefile.am +++ b/glamor/Makefile.am @@ -20,6 +20,7 @@ libglamor_la_SOURCES = \ glamor_polylines.c \ glamor_putimage.c \ glamor_setspans.c \ + glamor_segment.c \ glamor_render.c \ glamor_gradient.c \ glamor_program.c \ diff --git a/glamor/glamor_polyops.c b/glamor/glamor_polyops.c index 1484d80f1..f4036a01e 100644 --- a/glamor/glamor_polyops.c +++ b/glamor/glamor_polyops.c @@ -54,29 +54,3 @@ glamor_poly_point_nf(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, { return _glamor_poly_point(pDrawable, pGC, mode, npt, ppt, FALSE); } - -static Bool -_glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, - xSegment *pSeg, Bool fallback) -{ - if (!fallback && glamor_ddx_fallback_check_gc(pGC) - && glamor_ddx_fallback_check_pixmap(pDrawable)) - return FALSE; - - miPolySegment(pDrawable, pGC, nseg, pSeg); - - return TRUE; -} - -void -glamor_poly_segment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) -{ - _glamor_poly_segment(pDrawable, pGC, nseg, pSeg, TRUE); -} - -Bool -glamor_poly_segment_nf(DrawablePtr pDrawable, GCPtr pGC, int nseg, - xSegment *pSeg) -{ - return _glamor_poly_segment(pDrawable, pGC, nseg, pSeg, FALSE); -} diff --git a/glamor/glamor_segment.c b/glamor/glamor_segment.c new file mode 100644 index 000000000..84b27acce --- /dev/null +++ b/glamor/glamor_segment.c @@ -0,0 +1,39 @@ +/* + * Copyright © 2014 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#include "glamor_priv.h" + +Bool +glamor_poly_segment_nf(DrawablePtr drawable, GCPtr gc, int nseg, + xSegment *seg) +{ + return FALSE; +} + +void +glamor_poly_segment(DrawablePtr drawable, GCPtr gc, int nseg, + xSegment *seg) +{ + if (glamor_poly_segment_nf(drawable, gc, nseg, seg)) + return; + miPolySegment(drawable, gc, nseg, seg); +} |