summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/vdpau/device.c
diff options
context:
space:
mode:
authorChristian König <deathsimple@vodafone.de>2012-02-15 17:20:50 +0100
committerChristian König <deathsimple@vodafone.de>2012-02-25 12:14:14 +0100
commit1448e829e86981e6144410ba6a3d0f16357fb2b3 (patch)
tree18a95fc6ebab9afd59837d419f2e5ab96130624b /src/gallium/state_trackers/vdpau/device.c
parentb34c35a5243e0f4a23721891dbbccff8863b7d4c (diff)
vl: rework winsys interface
Throw out all the old and now unneeded stuff. Signed-off-by: Christian König <deathsimple@vodafone.de>
Diffstat (limited to 'src/gallium/state_trackers/vdpau/device.c')
-rw-r--r--src/gallium/state_trackers/vdpau/device.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c
index 7b23863d120..f4a3dc04bfb 100644
--- a/src/gallium/state_trackers/vdpau/device.c
+++ b/src/gallium/state_trackers/vdpau/device.c
@@ -41,8 +41,9 @@ PUBLIC VdpStatus
vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
VdpGetProcAddress **get_proc_address)
{
- VdpStatus ret;
+ struct pipe_screen *pscreen;
vlVdpDevice *dev = NULL;
+ VdpStatus ret;
if (!(display && device && get_proc_address))
return VDP_STATUS_INVALID_POINTER;
@@ -64,7 +65,8 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
goto no_vscreen;
}
- dev->context = vl_video_create(dev->vscreen);
+ pscreen = dev->vscreen->pscreen;
+ dev->context = pscreen->context_create(pscreen, dev->vscreen);
if (!dev->context) {
ret = VDP_STATUS_RESOURCES;
goto no_context;
@@ -76,7 +78,7 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
goto no_handle;
}
- vl_compositor_init(&dev->compositor, dev->context->pipe);
+ vl_compositor_init(&dev->compositor, dev->context);
*get_proc_address = &vlVdpGetProcAddress;
@@ -160,7 +162,7 @@ vlVdpDeviceDestroy(VdpDevice device)
return VDP_STATUS_INVALID_HANDLE;
vl_compositor_cleanup(&dev->compositor);
- vl_video_destroy(dev->context);
+ dev->context->destroy(dev->context);
vl_screen_destroy(dev->vscreen);
FREE(dev);