diff options
author | Christian König <[email protected]> | 2012-02-26 00:05:49 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2012-03-02 13:14:21 +0100 |
commit | 3aa087fa048dfda37ab247e2dbe4a809c2fac948 (patch) | |
tree | e96e0caa46250dcaaad92a14b992aac97b14b747 /src | |
parent | f8ac7e034803a1c873bf156c012fede6d2640097 (diff) |
st/vdpau: implement BitmapSurfaceCreate/Destroy
Signed-off-by: Christian König <[email protected]>
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/state_trackers/vdpau/bitmap.c | 78 | ||||
-rw-r--r-- | src/gallium/state_trackers/vdpau/vdpau_private.h | 6 |
2 files changed, 81 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/vdpau/bitmap.c b/src/gallium/state_trackers/vdpau/bitmap.c index 8c7dbe529e8..ddfed7205b7 100644 --- a/src/gallium/state_trackers/vdpau/bitmap.c +++ b/src/gallium/state_trackers/vdpau/bitmap.c @@ -27,6 +27,9 @@ #include <vdpau/vdpau.h> +#include "util/u_memory.h" +#include "util/u_sampler.h" + #include "vdpau_private.h" /** @@ -39,11 +42,67 @@ vlVdpBitmapSurfaceCreate(VdpDevice device, VdpBool frequently_accessed, VdpBitmapSurface *surface) { - VDPAU_MSG(VDPAU_TRACE, "[VDPAU] Creating a bitmap surface\n"); + struct pipe_context *pipe; + struct pipe_resource res_tmpl, *res; + struct pipe_sampler_view sv_templ; + + vlVdpBitmapSurface *vlsurface = NULL; + + if (!(width && height)) + return VDP_STATUS_INVALID_SIZE; + + vlVdpDevice *dev = vlGetDataHTAB(device); + if (!dev) + return VDP_STATUS_INVALID_HANDLE; + + pipe = dev->context; + if (!pipe) + return VDP_STATUS_INVALID_HANDLE; + if (!surface) return VDP_STATUS_INVALID_POINTER; - return VDP_STATUS_NO_IMPLEMENTATION; + vlsurface = CALLOC(1, sizeof(vlVdpBitmapSurface)); + if (!vlsurface) + return VDP_STATUS_RESOURCES; + + vlsurface->device = dev; + + memset(&res_tmpl, 0, sizeof(res_tmpl)); + + res_tmpl.target = PIPE_TEXTURE_2D; + res_tmpl.format = FormatRGBAToPipe(rgba_format); + res_tmpl.width0 = width; + res_tmpl.height0 = height; + res_tmpl.depth0 = 1; + res_tmpl.array_size = 1; + res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; + res_tmpl.usage = frequently_accessed ? PIPE_USAGE_DYNAMIC : PIPE_USAGE_STATIC; + res = pipe->screen->resource_create(pipe->screen, &res_tmpl); + if (!res) { + FREE(dev); + return VDP_STATUS_RESOURCES; + } + + memset(&sv_templ, 0, sizeof(sv_templ)); + u_sampler_view_default_template(&sv_templ, res, res->format); + vlsurface->sampler_view = pipe->create_sampler_view(pipe, res, &sv_templ); + if (!vlsurface->sampler_view) { + pipe_resource_reference(&res, NULL); + FREE(dev); + return VDP_STATUS_RESOURCES; + } + + *surface = vlAddDataHTAB(vlsurface); + if (*surface == 0) { + pipe_resource_reference(&res, NULL); + FREE(dev); + return VDP_STATUS_ERROR; + } + + pipe_resource_reference(&res, NULL); + + return VDP_STATUS_OK; } /** @@ -52,7 +111,20 @@ vlVdpBitmapSurfaceCreate(VdpDevice device, VdpStatus vlVdpBitmapSurfaceDestroy(VdpBitmapSurface surface) { - return VDP_STATUS_NO_IMPLEMENTATION; + vlVdpBitmapSurface *vlsurface; + + vlsurface = vlGetDataHTAB(surface); + if (!vlsurface) + return VDP_STATUS_INVALID_HANDLE; + + vlVdpResolveDelayedRendering(vlsurface->device, NULL, NULL); + + pipe_sampler_view_reference(&vlsurface->sampler_view, NULL); + + vlRemoveDataHTAB(surface); + FREE(vlsurface); + + 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 1f896cd4923..ab2c4201e0f 100644 --- a/src/gallium/state_trackers/vdpau/vdpau_private.h +++ b/src/gallium/state_trackers/vdpau/vdpau_private.h @@ -342,6 +342,12 @@ typedef struct struct pipe_video_buffer templat, *video_buffer; } vlVdpSurface; +typedef struct +{ + vlVdpDevice *device; + struct pipe_sampler_view *sampler_view; +} vlVdpBitmapSurface; + typedef uint64_t vlVdpTime; typedef struct |