frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fb: Hide Bresenham line details 

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-09-26 13:30:06 -04:00
parent b184a863c1
commit 5db0f067ed
2 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fb/fb.h
View File

@ -1268,34 +1268,20 @@ typedef void FbBres(DrawablePtr pDrawable,
int signdy, int signdy,
int axis, int x, int y, int e, int e1, int e3, int len); int axis, int x, int y, int e, int e1, int e3, int len);
extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash; extern _X_EXPORT void
fbSegment(DrawablePtr pDrawable,
GCPtr pGC,
int xa, int ya, int xb, int yb, Bool drawLast, int *dashOffset);
/* /*
* fbsetsp.c * fbsetsp.c
*/ */
extern _X_EXPORT void extern _X_EXPORT void
fbSetSpans(DrawablePtr pDrawable, fbSetSpans(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
char *src, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted); char *src, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
extern _X_EXPORT FbBres *fbSelectBres(DrawablePtr pDrawable, GCPtr pGC);
extern _X_EXPORT void
fbBres(DrawablePtr pDrawable,
GCPtr pGC,
int dashOffset,
int signdx,
int signdy, int axis, int x, int y, int e, int e1, int e3, int len);
extern _X_EXPORT void
fbSegment(DrawablePtr pDrawable,
GCPtr pGC,
int xa, int ya, int xb, int yb, Bool drawLast, int *dashOffset);
/* /*
* fbsolid.c * fbsolid.c
*/ */

22
fb/fbseg.c
View File

@ -33,7 +33,7 @@
((dir < 0) ? FbStipLeft(mask,bpp) : \ ((dir < 0) ? FbStipLeft(mask,bpp) : \
FbStipRight(mask,bpp))) FbStipRight(mask,bpp)))
void static void
fbBresSolid(DrawablePtr pDrawable, fbBresSolid(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -103,7 +103,7 @@ fbBresSolid(DrawablePtr pDrawable,
fbFinishAccess(pDrawable); fbFinishAccess(pDrawable);
} }
void static void
fbBresDash(DrawablePtr pDrawable, fbBresDash(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -176,7 +176,7 @@ fbBresDash(DrawablePtr pDrawable,
fbFinishAccess(pDrawable); fbFinishAccess(pDrawable);
} }
void static void
fbBresFill(DrawablePtr pDrawable, fbBresFill(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -216,7 +216,7 @@ fbSetFg(DrawablePtr pDrawable, GCPtr pGC, Pixel fg)
} }
} }
void static void
fbBresFillDash(DrawablePtr pDrawable, fbBresFillDash(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,
int dashOffset, int dashOffset,
@ -434,7 +434,7 @@ fbBresDash24RRop(DrawablePtr pDrawable,
* based on the contents of the specified GC. * based on the contents of the specified GC.
*/ */
FbBres * static FbBres *
fbSelectBres(DrawablePtr pDrawable, GCPtr pGC) fbSelectBres(DrawablePtr pDrawable, GCPtr pGC)
{ {
FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); FbGCPrivPtr pPriv = fbGetGCPrivate(pGC);
@ -493,18 +493,6 @@ fbSelectBres(DrawablePtr pDrawable, GCPtr pGC)
return bres; return bres;
} }
void
fbBres(DrawablePtr pDrawable,
GCPtr pGC,
int dashOffset,
int signdx,
int signdy, int axis, int x1, int y1, int e, int e1, int e3, int len)
{
(*fbSelectBres(pDrawable, pGC)) (pDrawable, pGC, dashOffset,
signdx, signdy, axis, x1, y1,
e, e1, e3, len);
}
void void
fbSegment(DrawablePtr pDrawable, fbSegment(DrawablePtr pDrawable,
GCPtr pGC, GCPtr pGC,