fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/vdpau: use the vl_screen dispatch

Browse source 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Emil Velikov 2015-11-06 23:12:13 +00:00
parent 4307155127
commit abbfda60d8
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/state_trackers/vdpau/device.c
View file

@ -136,7 +136,7 @@ no_handle:
no_resource:
dev->context->destroy(dev->context);
no_context:
vl_screen_destroy(dev->vscreen);
dev->vscreen->destroy(dev->vscreen);
no_vscreen:
FREE(dev);
no_dev:
@ -227,7 +227,7 @@ vlVdpDeviceFree(vlVdpDevice *dev)
vl_compositor_cleanup(&dev->compositor);
pipe_sampler_view_reference(&dev->dummy_sv, NULL);
dev->context->destroy(dev->context);
vl_screen_destroy(dev->vscreen);
dev->vscreen->destroy(dev->vscreen);
FREE(dev);
vlDestroyHTAB();
}

18
src/gallium/state_trackers/vdpau/presentation.c
View file

@ -186,7 +186,8 @@ vlVdpPresentationQueueGetTime(VdpPresentationQueue presentation_queue,
return VDP_STATUS_INVALID_HANDLE;
pipe_mutex_lock(pq->device->mutex);
*current_time = vl_screen_get_timestamp(pq->device->vscreen, pq->drawable);
*current_time = pq->device->vscreen->get_timestamp(pq->device->vscreen,
(void *)pq->drawable);
pipe_mutex_unlock(pq->device->mutex);
return VDP_STATUS_OK;
@ -214,6 +215,7 @@ vlVdpPresentationQueueDisplay(VdpPresentationQueue presentation_queue,
struct vl_compositor *compositor;
struct vl_compositor_state *cstate;
struct vl_screen *vscreen;
pq = vlGetDataHTAB(presentation_queue);
if (!pq)
@ -226,15 +228,16 @@ vlVdpPresentationQueueDisplay(VdpPresentationQueue presentation_queue,
pipe = pq->device->context;
compositor = &pq->device->compositor;
cstate = &pq->cstate;
vscreen = pq->device->vscreen;
pipe_mutex_lock(pq->device->mutex);
tex = vl_screen_texture_from_drawable(pq->device->vscreen, pq->drawable);
tex = vscreen->texture_from_drawable(vscreen, (void *)pq->drawable);
if (!tex) {
pipe_mutex_unlock(pq->device->mutex);
return VDP_STATUS_INVALID_HANDLE;
}
dirty_area = vl_screen_get_dirty_area(pq->device->vscreen);
dirty_area = vscreen->get_dirty_area(vscreen);
memset(&surf_templ, 0, sizeof(surf_templ));
surf_templ.format = tex->format;
@ -267,12 +270,9 @@ vlVdpPresentationQueueDisplay(VdpPresentationQueue presentation_queue,
vl_compositor_render(cstate, compositor, surf_draw, dirty_area, true);
}
vl_screen_set_next_timestamp(pq->device->vscreen, earliest_presentation_time);
pipe->screen->flush_frontbuffer
(
pipe->screen, tex, 0, 0,
vl_screen_get_private(pq->device->vscreen), NULL
);
vscreen->set_next_timestamp(vscreen, earliest_presentation_time);
pipe->screen->flush_frontbuffer(pipe->screen, tex, 0, 0,
vscreen->get_private(vscreen), NULL);
pipe->screen->fence_reference(pipe->screen, &surf->fence, NULL);
pipe->flush(pipe, &surf->fence, 0);