diff options
| author | Christian König <[email protected]> | 2011-12-12 16:28:24 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-12-14 14:20:44 +0100 |
| commit | 9e51c200a78b8be8be195e0d82d69e952afd1343 (patch) | |
| tree | ee6a5111abdd318965fa2a378055b1fe146e8d36 /src | |
| parent | 167b1b32c5ff30d514253072ce54513112c03d4d (diff) | |
st/vdpau: some mixer fixes
Correctly use destination_rect and destination_video_rect
in the mixer, and also use a dirty area tracking for output surfaces.
Based on work of Maarten Lankhorst <[email protected]>
Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/state_trackers/vdpau/mixer.c | 7 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vdpau/output.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vdpau/vdpau_private.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c index 5657e7c83b0..1588744ad63 100644 --- a/src/gallium/state_trackers/vdpau/mixer.c +++ b/src/gallium/state_trackers/vdpau/mixer.c @@ -152,7 +152,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, uint32_t layer_count, VdpLayer const *layers) { - struct pipe_video_rect src_rect; + struct pipe_video_rect src_rect, dst_rect, dst_clip; vlVdpVideoMixer *vmixer; vlVdpSurface *surf; @@ -173,7 +173,10 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, vl_compositor_clear_layers(&vmixer->compositor); vl_compositor_set_buffer_layer(&vmixer->compositor, 0, surf->video_buffer, RectToPipe(video_source_rect, &src_rect), NULL); - vl_compositor_render(&vmixer->compositor, dst->surface, NULL, NULL, NULL); + vl_compositor_render(&vmixer->compositor, dst->surface, + RectToPipe(destination_video_rect, &dst_rect), + RectToPipe(destination_rect, &dst_clip), + &dst->dirty_area); return VDP_STATUS_OK; } diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c index d83831e5dd2..cca69c4373e 100644 --- a/src/gallium/state_trackers/vdpau/output.c +++ b/src/gallium/state_trackers/vdpau/output.c @@ -114,6 +114,8 @@ vlVdpOutputSurfaceCreate(VdpDevice device, pipe_resource_reference(&res, NULL); + vl_compositor_reset_dirty_area(&vlsurface->dirty_area); + return VDP_STATUS_OK; } diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h index eba9e2f2d37..1922b703d33 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -323,6 +323,7 @@ typedef struct struct pipe_surface *surface; struct pipe_sampler_view *sampler_view; struct pipe_fence_handle *fence; + struct u_rect dirty_area; } vlVdpOutputSurface; typedef struct |