render: Delete renderedge.[ch]
The functions in these files have not been used since trap rasterization was moved to pixman. They survived until now to preserve the server abi. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
This commit is contained in:
Søren Sandmann Pedersen
parent
6118346d64
commit
74bc2d8c6b
|
|
@ -28,9 +28,6 @@
|
||||||
#ifndef _FBPICT_H_
|
#ifndef _FBPICT_H_
|
||||||
#define _FBPICT_H_
|
#define _FBPICT_H_
|
||||||
|
|
||||||
#include "renderedge.h"
|
|
||||||
|
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
#define INLINE __inline__
|
#define INLINE __inline__
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,6 @@
|
||||||
|
|
||||||
#include "picturestr.h"
|
#include "picturestr.h"
|
||||||
#include "mipict.h"
|
#include "mipict.h"
|
||||||
#include "renderedge.h"
|
|
||||||
#include "fbpict.h"
|
#include "fbpict.h"
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@ cat > sdksyms.c << EOF
|
||||||
#include "mipict.h"
|
#include "mipict.h"
|
||||||
#include "glyphstr.h"
|
#include "glyphstr.h"
|
||||||
#include "picturestr.h"
|
#include "picturestr.h"
|
||||||
#include "renderedge.h"
|
|
||||||
|
|
||||||
|
|
||||||
/* fb/Makefile.am -- module */
|
/* fb/Makefile.am -- module */
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,8 @@ librender_la_SOURCES = \
|
||||||
mitrap.c \
|
mitrap.c \
|
||||||
mitri.c \
|
mitri.c \
|
||||||
picture.c \
|
picture.c \
|
||||||
render.c \
|
render.c
|
||||||
renderedge.c
|
|
||||||
|
|
||||||
if XORG
|
if XORG
|
||||||
sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h renderedge.h
|
sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2004 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 Keith Packard not be used in
|
|
||||||
* advertising or publicity pertaining to distribution of the software without
|
|
||||||
* specific, written prior permission. Keith Packard makes no
|
|
||||||
* representations about the suitability of this software for any purpose. It
|
|
||||||
* is provided "as is" without express or implied warranty.
|
|
||||||
*
|
|
||||||
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
||||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
||||||
* EVENT SHALL KEITH PACKARD 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_DIX_CONFIG_H
|
|
||||||
#include <dix-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "renderedge.h"
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Compute the smallest value no less than y which is on a
|
|
||||||
* grid row
|
|
||||||
*/
|
|
||||||
|
|
||||||
xFixed
|
|
||||||
RenderSampleCeilY (xFixed y, int n)
|
|
||||||
{
|
|
||||||
return pixman_sample_ceil_y (y, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define _div(a,b) ((a) >= 0 ? (a) / (b) : -((-(a) + (b) - 1) / (b)))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Compute the largest value no greater than y which is on a
|
|
||||||
* grid row
|
|
||||||
*/
|
|
||||||
xFixed
|
|
||||||
RenderSampleFloorY (xFixed y, int n)
|
|
||||||
{
|
|
||||||
return pixman_sample_floor_y (y, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step an edge by any amount (including negative values)
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
RenderEdgeStep (RenderEdge *e, int n)
|
|
||||||
{
|
|
||||||
pixman_edge_step (e, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Initialize one edge structure given the line endpoints and a
|
|
||||||
* starting y value
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
RenderEdgeInit (RenderEdge *e,
|
|
||||||
int n,
|
|
||||||
xFixed y_start,
|
|
||||||
xFixed x_top,
|
|
||||||
xFixed y_top,
|
|
||||||
xFixed x_bot,
|
|
||||||
xFixed y_bot)
|
|
||||||
{
|
|
||||||
pixman_edge_init (e, n, y_start, x_top, y_top, x_bot, y_bot);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Initialize one edge structure given a line, starting y value
|
|
||||||
* and a pixel offset for the line
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
RenderLineFixedEdgeInit (RenderEdge *e,
|
|
||||||
int n,
|
|
||||||
xFixed y,
|
|
||||||
xLineFixed *line,
|
|
||||||
int x_off,
|
|
||||||
int y_off)
|
|
||||||
{
|
|
||||||
pixman_line_fixed_edge_init (e, n, y, (pixman_line_fixed_t *)line, x_off, y_off);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,105 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright © 2004 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 Keith Packard not be used in
|
|
||||||
* advertising or publicity pertaining to distribution of the software without
|
|
||||||
* specific, written prior permission. Keith Packard makes no
|
|
||||||
* representations about the suitability of this software for any purpose. It
|
|
||||||
* is provided "as is" without express or implied warranty.
|
|
||||||
*
|
|
||||||
* KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
||||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
||||||
* EVENT SHALL KEITH PACKARD 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _RENDEREDGE_H_
|
|
||||||
#define _RENDEREDGE_H_
|
|
||||||
|
|
||||||
#include "picturestr.h"
|
|
||||||
|
|
||||||
#define MAX_ALPHA(n) ((1 << (n)) - 1)
|
|
||||||
#define N_Y_FRAC(n) ((n) == 1 ? 1 : (1 << ((n)/2)) - 1)
|
|
||||||
#define N_X_FRAC(n) ((1 << ((n)/2)) + 1)
|
|
||||||
|
|
||||||
#define STEP_Y_SMALL(n) (xFixed1 / N_Y_FRAC(n))
|
|
||||||
#define STEP_Y_BIG(n) (xFixed1 - (N_Y_FRAC(n) - 1) * STEP_Y_SMALL(n))
|
|
||||||
|
|
||||||
#define Y_FRAC_FIRST(n) (STEP_Y_SMALL(n) / 2)
|
|
||||||
#define Y_FRAC_LAST(n) (Y_FRAC_FIRST(n) + (N_Y_FRAC(n) - 1) * STEP_Y_SMALL(n))
|
|
||||||
|
|
||||||
#define STEP_X_SMALL(n) (xFixed1 / N_X_FRAC(n))
|
|
||||||
#define STEP_X_BIG(n) (xFixed1 - (N_X_FRAC(n) - 1) * STEP_X_SMALL(n))
|
|
||||||
|
|
||||||
#define X_FRAC_FIRST(n) (STEP_X_SMALL(n) / 2)
|
|
||||||
#define X_FRAC_LAST(n) (X_FRAC_FIRST(n) + (N_X_FRAC(n) - 1) * STEP_X_SMALL(n))
|
|
||||||
|
|
||||||
#define RenderSamplesX(x,n) ((n) == 1 ? 0 : (xFixedFrac (x) + X_FRAC_FIRST(n)) / STEP_X_SMALL(n))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* An edge structure. This represents a single polygon edge
|
|
||||||
* and can be quickly stepped across small or large gaps in the
|
|
||||||
* sample grid
|
|
||||||
*/
|
|
||||||
typedef pixman_edge_t RenderEdge;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step across a small sample grid gap
|
|
||||||
*/
|
|
||||||
#define RenderEdgeStepSmall(edge) { \
|
|
||||||
edge->x += edge->stepx_small; \
|
|
||||||
edge->e += edge->dx_small; \
|
|
||||||
if (edge->e > 0) \
|
|
||||||
{ \
|
|
||||||
edge->e -= edge->dy; \
|
|
||||||
edge->x += edge->signdx; \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Step across a large sample grid gap
|
|
||||||
*/
|
|
||||||
#define RenderEdgeStepBig(edge) { \
|
|
||||||
edge->x += edge->stepx_big; \
|
|
||||||
edge->e += edge->dx_big; \
|
|
||||||
if (edge->e > 0) \
|
|
||||||
{ \
|
|
||||||
edge->e -= edge->dy; \
|
|
||||||
edge->x += edge->signdx; \
|
|
||||||
} \
|
|
||||||
}
|
|
||||||
|
|
||||||
extern _X_EXPORT xFixed
|
|
||||||
RenderSampleCeilY (xFixed y, int bpp);
|
|
||||||
|
|
||||||
extern _X_EXPORT xFixed
|
|
||||||
RenderSampleFloorY (xFixed y, int bpp);
|
|
||||||
|
|
||||||
extern _X_EXPORT void
|
|
||||||
RenderEdgeStep (RenderEdge *e, int n);
|
|
||||||
|
|
||||||
extern _X_EXPORT void
|
|
||||||
RenderEdgeInit (RenderEdge *e,
|
|
||||||
int bpp,
|
|
||||||
xFixed y_start,
|
|
||||||
xFixed x_top,
|
|
||||||
xFixed y_top,
|
|
||||||
xFixed x_bot,
|
|
||||||
xFixed y_bot);
|
|
||||||
|
|
||||||
extern _X_EXPORT void
|
|
||||||
RenderLineFixedEdgeInit (RenderEdge *e,
|
|
||||||
int bpp,
|
|
||||||
xFixed y,
|
|
||||||
xLineFixed *line,
|
|
||||||
int x_off,
|
|
||||||
int y_off);
|
|
||||||
|
|
||||||
#endif /* _RENDEREDGE_H_ */
|
|
||||||
Loading…
Reference in New Issue