Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Pass the hints down to the PolyPoint fallback 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-09-07 22:12:17 +01:00
parent 6c9df48fa8
commit ed7b8db249
4 changed files with 73 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sna/fb/fb.h
View File

@ -515,7 +515,9 @@ extern RegionPtr
fbBitmapToRegion(PixmapPtr pixmap);
extern void
fbPolyPoint(DrawablePtr drawable, GCPtr gc, int mode, int n, xPoint *pt);
fbPolyPoint(DrawablePtr drawable, GCPtr gc,
int mode, int n, xPoint *pt,
unsigned flags);
extern void
fbPushImage(DrawablePtr drawable, GCPtr gc,

42
src/sna/fb/fbpoint.c
View File

@ -25,21 +25,27 @@
#include <micoord.h>
#define DOTS fbDots8
#define DOTS__SIMPLE fbDots8__simple
#define BITS BYTE
#include "fbpointbits.h"
#undef BITS
#undef DOTS__SIMPLE
#undef DOTS
#define DOTS fbDots16
#define DOTS__SIMPLE fbDots16__simple
#define BITS CARD16
#include "fbpointbits.h"
#undef BITS
#undef DOTS__SIMPLE
#undef DOTS
#define DOTS fbDots32
#define DOTS__SIMPLE fbDots32__simple
#define BITS CARD32
#include "fbpointbits.h"
#undef BITS
#undef DOTS__SIMPLE
#undef DOTS
static void
@ -74,7 +80,7 @@ fbDots(FbBits *dstOrig, FbStride dstStride, int dstBpp,
void
fbPolyPoint(DrawablePtr drawable, GCPtr gc,
int mode, int n, xPoint *pt)
int mode, int n, xPoint *pt, unsigned flags)
{
FbBits *dst;
FbStride dstStride;
@ -97,16 +103,30 @@ fbPolyPoint(DrawablePtr drawable, GCPtr gc,
fbGetDrawable(drawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
dots = fbDots;
switch (dstBpp) {
case 8:
dots = fbDots8;
break;
case 16:
dots = fbDots16;
break;
case 32:
dots = fbDots32;
break;
if ((flags & 2) == 0 && fb_gc(gc)->and == 0) {
switch (dstBpp) {
case 8:
dots = fbDots8__simple;
break;
case 16:
dots = fbDots16__simple;
break;
case 32:
dots = fbDots32__simple;
break;
}
} else {
switch (dstBpp) {
case 8:
dots = fbDots8;
break;
case 16:
dots = fbDots16;
break;
case 32:
dots = fbDots32;
break;
}
}
dots(dst, dstStride, dstBpp, gc->pCompositeClip, pt, n,
drawable->x, drawable->y, dstXoff, dstYoff,

38
src/sna/fb/fbpointbits.h
View File

@ -106,5 +106,43 @@ DOTS(FbBits * dst,
}
}
static void
DOTS__SIMPLE(FbBits * dst,
FbStride dstStride,
int dstBpp,
RegionPtr region,
xPoint * ptsOrig,
int npt, int xorg, int yorg, int xoff, int yoff,
FbBits and, FbBits xor)
{
uint32_t *pts = (uint32_t *) ptsOrig;
BITS *bits = (BITS *) dst, *p;
BITS bxor = (BITS) xor;
FbStride bitsStride = dstStride * (sizeof(FbBits) / sizeof(BITS));
bits += bitsStride * (yorg + yoff) + (xorg + xoff);
while (npt >= 2) {
union {
uint32_t pt32[2];
uint64_t pt64;
} pt;
pt.pt64 = *(uint64_t *)pts;
p = bits + intToY(pt.pt32[0]) * bitsStride + intToX(pt.pt32[0]);
WRITE(p, bxor);
p = bits + intToY(pt.pt32[1]) * bitsStride + intToX(pt.pt32[1]);
WRITE(p, bxor);
pts += 2;
npt -= 2;
}
if (npt) {
uint32_t pt = *pts;
p = bits + intToY(pt) * bitsStride + intToX(pt);
WRITE(p, bxor);
}
}
#undef RROP
#undef isClipped

2
src/sna/sna_accel.c
View File

@ -6696,7 +6696,7 @@ fallback:
goto out_gc;
DBG(("%s: fbPolyPoint\n", __FUNCTION__));
fbPolyPoint(drawable, gc, mode, n, pt);
fbPolyPoint(drawable, gc, mode, n, pt, flags);
FALLBACK_FLUSH(drawable);
out_gc:
sna_gc_move_to_gpu(gc);