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

sna/g4x: Use the render pipeline more often for composite operations 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-11-23 18:01:25 +00:00
parent 54d8968da5
commit e0b906b096
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/sna/g4x_render.c
View File

@ -2030,22 +2030,12 @@ picture_is_cpu(PicturePtr picture)
return !is_gpu(picture->pDrawable);
}
static inline bool prefer_blt(struct sna *sna)
{
#if PREFER_BLT
return true;
(void)sna;
#else
return sna->kgem.mode != KGEM_RENDER;
#endif
}
static bool
try_blt(struct sna *sna,
PicturePtr dst, PicturePtr src,
int width, int height)
{
if (prefer_blt(sna)) {
if (sna->kgem.mode != KGEM_RENDER) {
DBG(("%s: already performing BLT\n", __FUNCTION__));
return true;
}
@ -2996,6 +2986,16 @@ g4x_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
g4x_vertex_flush(sna);
}
static inline bool prefer_blt_fill(struct sna *sna)
{
#if PREFER_BLT
return true;
(void)sna;
#else
return sna->kgem.mode != KGEM_RENDER;
#endif
}
static bool
g4x_render_copy(struct sna *sna, uint8_t alu,
PixmapPtr src, struct kgem_bo *src_bo,
@ -3008,7 +3008,7 @@ g4x_render_copy(struct sna *sna, uint8_t alu,
dst->drawable.serialNumber,
alu));
if (prefer_blt(sna) &&
if (prefer_blt_fill(sna) &&
sna_blt_compare_depth(&src->drawable, &dst->drawable) &&
sna_blt_copy(sna, alu,
src_bo, dst_bo,
@ -3128,7 +3128,7 @@ g4x_render_fill_boxes(struct sna *sna,
}
if (op <= PictOpSrc &&
(prefer_blt(sna) ||
(prefer_blt_fill(sna) ||
too_large(dst->drawable.width, dst->drawable.height) ||
!g4x_check_dst_format(format))) {
uint8_t alu = GXinvalid;
@ -3254,7 +3254,7 @@ g4x_render_fill(struct sna *sna, uint8_t alu,
uint32_t color,
struct sna_fill_op *op)
{
if (prefer_blt(sna) &&
if (prefer_blt_fill(sna) &&
sna_blt_fill(sna, alu,
dst_bo, dst->drawable.bitsPerPixel,
color,