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

sna/gen6: Enable spans interface for boxes 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-11-04 13:43:03 +00:00
parent 465515a144
commit 567cfa508f
5 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/gen2_render.c
View File

@ -1684,6 +1684,7 @@ gen2_render_composite_spans(struct sna *sna,
int16_t src_x, int16_t src_y,
int16_t dst_x, int16_t dst_y,
int16_t width, int16_t height,
unsigned flags,
struct sna_composite_spans_op *tmp)
{
DBG(("%s(src=(%d, %d), dst=(%d, %d), size=(%d, %d))\n", __FUNCTION__,

1
src/sna/gen3_render.c
View File

@ -2810,6 +2810,7 @@ gen3_render_composite_spans(struct sna *sna,
int16_t src_x, int16_t src_y,
int16_t dst_x, int16_t dst_y,
int16_t width, int16_t height,
unsigned flags,
struct sna_composite_spans_op *tmp)
{
bool no_offset;

10
src/sna/gen6_render.c
View File

@ -50,7 +50,7 @@
#endif
#define NO_COMPOSITE 0
#define NO_COMPOSITE_SPANS 1
#define NO_COMPOSITE_SPANS 0
#define NO_COPY 0
#define NO_COPY_BOXES 0
#define NO_FILL 0
@ -2465,10 +2465,14 @@ gen6_render_composite_spans(struct sna *sna,
int16_t src_x, int16_t src_y,
int16_t dst_x, int16_t dst_y,
int16_t width, int16_t height,
unsigned flags,
struct sna_composite_spans_op *tmp)
{
DBG(("%s: %dx%d, current mode=%d\n", __FUNCTION__,
width, height, sna->kgem.ring));
DBG(("%s: %dx%d with flags=%x, current mode=%d\n", __FUNCTION__,
width, height, flags, sna->kgem.ring));
if ((flags & COMPOSITE_SPANS_RECTILINEAR) == 0)
return FALSE;
if (op >= ARRAY_SIZE(gen6_blend_op))
return FALSE;

2
src/sna/sna_render.h
View File

@ -193,7 +193,9 @@ struct sna_render {
int16_t src_x, int16_t src_y,
int16_t dst_x, int16_t dst_y,
int16_t w, int16_t h,
unsigned flags,
struct sna_composite_spans_op *tmp);
#define COMPOSITE_SPANS_RECTILINEAR 0x1
Bool (*video)(struct sna *sna,
struct sna_video *video,

5
src/sna/sna_trapezoids.c
View File

@ -2494,6 +2494,7 @@ composite_unaligned_boxes(CARD8 op,
extents.x1, extents.y1,
extents.x2 - extents.x1,
extents.y2 - extents.y1,
COMPOSITE_SPANS_RECTILINEAR,
&tmp)) {
DBG(("%s: composite spans render op not supported\n",
__FUNCTION__));
@ -2790,6 +2791,7 @@ trapezoid_span_converter(CARD8 op, PicturePtr src, PicturePtr dst,
extents.x1, extents.y1,
extents.x2 - extents.x1,
extents.y2 - extents.y1,
0,
&tmp)) {
DBG(("%s: fallback -- composite spans render op not supported\n",
__FUNCTION__));
@ -3237,6 +3239,7 @@ trap_span_converter(PicturePtr dst,
extents.x1, extents.y1,
extents.x2 - extents.x1,
extents.y2 - extents.y1,
0,
&tmp)) {
DBG(("%s: fallback -- composite spans render op not supported\n",
__FUNCTION__));
@ -3773,6 +3776,7 @@ triangles_span_converter(CARD8 op, PicturePtr src, PicturePtr dst,
extents.x1, extents.y1,
extents.x2 - extents.x1,
extents.y2 - extents.y1,
0,
&tmp)) {
DBG(("%s: fallback -- composite spans render op not supported\n",
__FUNCTION__));
@ -4123,6 +4127,7 @@ tristrip_span_converter(CARD8 op, PicturePtr src, PicturePtr dst,
extents.x1, extents.y1,
extents.x2 - extents.x1,
extents.y2 - extents.y1,
0,
&tmp)) {
DBG(("%s: fallback -- composite spans render op not supported\n",
__FUNCTION__));