diff options
| -rw-r--r-- | src/gallium/state_trackers/va/surface.c | 120 |
1 files changed, 120 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c index 0d0b86321b1..8d4487bfb5a 100644 --- a/src/gallium/state_trackers/va/surface.c +++ b/src/gallium/state_trackers/va/surface.c @@ -32,6 +32,8 @@ #include "util/u_memory.h" #include "util/u_handle_table.h" #include "util/u_rect.h" +#include "util/u_sampler.h" +#include "util/u_surface.h" #include "vl/vl_compositor.h" #include "vl/vl_winsys.h" @@ -81,6 +83,7 @@ vlVaCreateSurfaces(VADriverContextP ctx, int width, int height, int format, surf->templat = templat; surf->buffer = drv->pipe->create_video_buffer(drv->pipe, &templat); + util_dynarray_init(&surf->subpics); surfaces[i] = handle_table_add(drv->htab, surf); } @@ -109,6 +112,7 @@ vlVaDestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_sur surf->buffer->destroy(surf->buffer); if(surf->fence) drv->pipe->screen->fence_reference(drv->pipe->screen, &surf->fence, NULL); + util_dynarray_fini(&surf->subpics); FREE(surf); handle_table_remove(drv->htab, surface_list[i]); } @@ -143,6 +147,115 @@ vlVaQuerySurfaceError(VADriverContextP ctx, VASurfaceID render_target, VAStatus return VA_STATUS_ERROR_UNIMPLEMENTED; } +static void +upload_sampler(struct pipe_context *pipe, struct pipe_sampler_view *dst, + const struct pipe_box *dst_box, const void *src, unsigned src_stride, + unsigned src_x, unsigned src_y) +{ + struct pipe_transfer *transfer; + void *map; + + map = pipe->transfer_map(pipe, dst->texture, 0, PIPE_TRANSFER_WRITE, + dst_box, &transfer); + if (!map) + return; + + util_copy_rect(map, dst->texture->format, transfer->stride, 0, 0, + dst_box->width, dst_box->height, + src, src_stride, src_x, src_y); + + pipe->transfer_unmap(pipe, transfer); +} + +static VAStatus +vlVaPutSubpictures(vlVaSurface *surf, vlVaDriver *drv, + struct pipe_surface *surf_draw, struct u_rect *dirty_area, + struct u_rect *src_rect, struct u_rect *dst_rect) +{ + vlVaSubpicture *sub; + int i; + + if (!(surf->subpics.data || surf->subpics.size)) + return VA_STATUS_SUCCESS; + + for (i = 0; i < surf->subpics.size/sizeof(vlVaSubpicture *); i++) { + struct pipe_blend_state blend; + void *blend_state; + vlVaBuffer *buf; + struct pipe_box box; + struct u_rect *s, *d, sr, dr, c; + int sw, sh, dw, dh; + + sub = ((vlVaSubpicture **)surf->subpics.data)[i]; + if (!sub) + continue; + + buf = handle_table_get(drv->htab, sub->image->buf); + if (!buf) + return VA_STATUS_ERROR_INVALID_IMAGE; + + box.x = 0; + box.y = 0; + box.z = 0; + box.width = sub->dst_rect.x1 - sub->dst_rect.x0; + box.height = sub->dst_rect.y1 - sub->dst_rect.y0; + box.depth = 1; + + s = &sub->src_rect; + d = &sub->dst_rect; + sw = s->x1 - s->x0; + sh = s->y1 - s->y0; + dw = d->x1 - d->x0; + dh = d->y1 - d->y0; + c.x0 = MAX2(d->x0, s->x0); + c.y0 = MAX2(d->y0, s->y0); + c.x1 = MIN2(d->x0 + dw, src_rect->x1); + c.y1 = MIN2(d->y0 + dh, src_rect->y1); + sr.x0 = s->x0 + (c.x0 - d->x0)*(sw/(float)dw); + sr.y0 = s->y0 + (c.y0 - d->y0)*(sh/(float)dh); + sr.x1 = s->x0 + (c.x1 - d->x0)*(sw/(float)dw); + sr.y1 = s->y0 + (c.y1 - d->y0)*(sh/(float)dh); + + s = src_rect; + d = dst_rect; + sw = s->x1 - s->x0; + sh = s->y1 - s->y0; + dw = d->x1 - d->x0; + dh = d->y1 - d->y0; + dr.x0 = d->x0 + c.x0*(dw/(float)sw); + dr.y0 = d->y0 + c.y0*(dh/(float)sh); + dr.x1 = d->x0 + c.x1*(dw/(float)sw); + dr.y1 = d->y0 + c.y1*(dh/(float)sh); + + memset(&blend, 0, sizeof(blend)); + blend.independent_blend_enable = 0; + blend.rt[0].blend_enable = 1; + blend.rt[0].rgb_src_factor = PIPE_BLENDFACTOR_SRC_ALPHA; + blend.rt[0].rgb_dst_factor = PIPE_BLENDFACTOR_INV_SRC_ALPHA; + blend.rt[0].alpha_src_factor = PIPE_BLENDFACTOR_ZERO; + blend.rt[0].alpha_dst_factor = PIPE_BLENDFACTOR_ZERO; + blend.rt[0].rgb_func = PIPE_BLEND_ADD; + blend.rt[0].alpha_func = PIPE_BLEND_ADD; + blend.rt[0].colormask = PIPE_MASK_RGBA; + blend.logicop_enable = 0; + blend.logicop_func = PIPE_LOGICOP_CLEAR; + blend.dither = 0; + blend_state = drv->pipe->create_blend_state(drv->pipe, &blend); + + vl_compositor_clear_layers(&drv->cstate); + vl_compositor_set_layer_blend(&drv->cstate, 0, blend_state, false); + upload_sampler(drv->pipe, sub->sampler, &box, buf->data, + sub->image->pitches[0], 0, 0); + vl_compositor_set_rgba_layer(&drv->cstate, &drv->compositor, 0, sub->sampler, + &sr, NULL, NULL); + vl_compositor_set_layer_dst_area(&drv->cstate, 0, &dr); + vl_compositor_render(&drv->cstate, &drv->compositor, surf_draw, dirty_area, false); + drv->pipe->delete_blend_state(drv->pipe, blend_state); + } + + return VA_STATUS_SUCCESS; +} + VAStatus vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short srcx, short srcy, unsigned short srcw, unsigned short srch, short destx, short desty, @@ -155,6 +268,8 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s struct pipe_resource *tex; struct pipe_surface surf_templ, *surf_draw; struct u_rect src_rect, *dirty_area; + struct u_rect dst_rect = {destx, destx + destw, desty, desty + desth}; + VAStatus status; if (!ctx) return VA_STATUS_ERROR_INVALID_CONTEXT; @@ -192,8 +307,13 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s vl_compositor_clear_layers(&drv->cstate); vl_compositor_set_buffer_layer(&drv->cstate, &drv->compositor, 0, surf->buffer, &src_rect, NULL, VL_COMPOSITOR_WEAVE); + vl_compositor_set_layer_dst_area(&drv->cstate, 0, &dst_rect); vl_compositor_render(&drv->cstate, &drv->compositor, surf_draw, dirty_area, true); + status = vlVaPutSubpictures(surf, drv, surf_draw, dirty_area, &src_rect, &dst_rect); + if (status) + return status; + screen->flush_frontbuffer ( screen, tex, 0, 0, |