Attachment 104577 Details for Bug 80561 – Possible fix

[patch] Possible fix

0001-st-vdpau-fix-vlVdpOutputSurfaceRender-Output-Bitmap-.patch (text/plain), 7.48 KB, created by Christian König on 2014-08-13 18:23:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2014-08-13 18:23:46 UTC

Size: 7.48 KB

patch

obsolete

>From e4b59a4978a5351069c69a883257a9bc0aad8049 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Wed, 13 Aug 2014 20:21:06 +0200
>Subject: [PATCH] st/vdpau: fix vlVdpOutputSurfaceRender(Output|Bitmap)Surface
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Correctly handle that the source_surface is only optional.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> src/gallium/state_trackers/vdpau/device.c        | 43 +++++++++++++++++++++++-
> src/gallium/state_trackers/vdpau/output.c        | 42 +++++++++++++++--------
> src/gallium/state_trackers/vdpau/vdpau_private.h |  1 +
> 3 files changed, 71 insertions(+), 15 deletions(-)
>
>diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c
>index 9c5ec60..efc1fde 100644
>--- a/src/gallium/state_trackers/vdpau/device.c
>+++ b/src/gallium/state_trackers/vdpau/device.c
>@@ -42,6 +42,8 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
>                           VdpGetProcAddress **get_proc_address)
> {
>    struct pipe_screen *pscreen;
>+   struct pipe_resource *res, res_tmpl;
>+   struct pipe_sampler_view sv_tmpl;
>    vlVdpDevice *dev = NULL;
>    VdpStatus ret;
> 
>@@ -79,6 +81,43 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
>       goto no_context;
>    }
> 
>+   memset(&res_tmpl, 0, sizeof(res_tmpl));
>+
>+   res_tmpl.target = PIPE_TEXTURE_2D;
>+   res_tmpl.format = PIPE_FORMAT_R8G8B8A8_UNORM;
>+   res_tmpl.width0 = 1;
>+   res_tmpl.height0 = 1;
>+   res_tmpl.depth0 = 1;
>+   res_tmpl.array_size = 1;
>+   res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW;
>+   res_tmpl.usage = PIPE_USAGE_DEFAULT;
>+
>+   if (!CheckSurfaceParams(pscreen, &res_tmpl)) {
>+      ret = VDP_STATUS_NO_IMPLEMENTATION;
>+      goto no_resource;
>+   }
>+
>+   res = pscreen->resource_create(pscreen, &res_tmpl);
>+   if (!res) {
>+      ret = VDP_STATUS_RESOURCES;
>+      goto no_resource;
>+   }
>+
>+   memset(&sv_tmpl, 0, sizeof(sv_tmpl));
>+   u_sampler_view_default_template(&sv_tmpl, res, res->format);
>+
>+   sv_tmpl.swizzle_r = PIPE_SWIZZLE_ONE;
>+   sv_tmpl.swizzle_g = PIPE_SWIZZLE_ONE;
>+   sv_tmpl.swizzle_b = PIPE_SWIZZLE_ONE;
>+   sv_tmpl.swizzle_a = PIPE_SWIZZLE_ONE;
>+
>+   dev->dummy_sv = dev->context->create_sampler_view(dev->context, res, &sv_tmpl);
>+   pipe_resource_reference(&res, NULL);
>+   if (!dev->dummy_sv) {
>+      ret = VDP_STATUS_RESOURCES;
>+      goto no_resource;
>+   }
>+
>    *device = vlAddDataHTAB(dev);
>    if (*device == 0) {
>       ret = VDP_STATUS_ERROR;
>@@ -93,8 +132,9 @@ vdp_imp_device_create_x11(Display *display, int screen, VdpDevice *device,
>    return VDP_STATUS_OK;
> 
> no_handle:
>+   pipe_sampler_view_reference(&dev->dummy_sv, NULL);
>+no_resource:
>    dev->context->destroy(dev->context);
>-   /* Destroy vscreen */
> no_context:
>    vl_screen_destroy(dev->vscreen);
> no_vscreen:
>@@ -185,6 +225,7 @@ vlVdpDeviceFree(vlVdpDevice *dev)
> {
>    pipe_mutex_destroy(dev->mutex);
>    vl_compositor_cleanup(&dev->compositor);
>+   pipe_sampler_view_reference(&dev->dummy_sv, NULL);
>    dev->context->destroy(dev->context);
>    vl_screen_destroy(dev->vscreen);
>    FREE(dev);
>diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c
>index caae50f..3248f76 100644
>--- a/src/gallium/state_trackers/vdpau/output.c
>+++ b/src/gallium/state_trackers/vdpau/output.c
>@@ -624,9 +624,9 @@ vlVdpOutputSurfaceRenderOutputSurface(VdpOutputSurface destination_surface,
>                                       uint32_t flags)
> {
>    vlVdpOutputSurface *dst_vlsurface;
>-   vlVdpOutputSurface *src_vlsurface;
> 
>    struct pipe_context *context;
>+   struct pipe_sampler_view *src_sv;
>    struct vl_compositor *compositor;
>    struct vl_compositor_state *cstate;
> 
>@@ -639,12 +639,19 @@ vlVdpOutputSurfaceRenderOutputSurface(VdpOutputSurface destination_surface,
>    if (!dst_vlsurface)
>       return VDP_STATUS_INVALID_HANDLE;
> 
>-   src_vlsurface = vlGetDataHTAB(source_surface);
>-   if (!src_vlsurface)
>-      return VDP_STATUS_INVALID_HANDLE;
>+   if (source_surface == VDP_INVALID_HANDLE) {
>+      src_sv = dst_vlsurface->device->dummy_sv;
>+
>+   } else {
>+      vlVdpOutputSurface *src_vlsurface = vlGetDataHTAB(source_surface);
>+      if (!src_vlsurface)
>+         return VDP_STATUS_INVALID_HANDLE;
> 
>-   if (dst_vlsurface->device != src_vlsurface->device)
>-      return VDP_STATUS_HANDLE_DEVICE_MISMATCH;
>+      if (dst_vlsurface->device != src_vlsurface->device)
>+         return VDP_STATUS_HANDLE_DEVICE_MISMATCH;
>+
>+      src_sv = src_vlsurface->sampler_view;
>+   }
> 
>    pipe_mutex_lock(dst_vlsurface->device->mutex);
>    vlVdpResolveDelayedRendering(dst_vlsurface->device, NULL, NULL);
>@@ -657,7 +664,7 @@ vlVdpOutputSurfaceRenderOutputSurface(VdpOutputSurface destination_surface,
> 
>    vl_compositor_clear_layers(cstate);
>    vl_compositor_set_layer_blend(cstate, 0, blend, false);
>-   vl_compositor_set_rgba_layer(cstate, compositor, 0, src_vlsurface->sampler_view,
>+   vl_compositor_set_rgba_layer(cstate, compositor, 0, src_sv,
>                                 RectToPipe(source_rect, &src_rect), NULL,
>                                 ColorsToPipe(colors, flags, vlcolors));
>    STATIC_ASSERT(VL_COMPOSITOR_ROTATE_0 == VDP_OUTPUT_SURFACE_RENDER_ROTATE_0);
>@@ -688,9 +695,9 @@ vlVdpOutputSurfaceRenderBitmapSurface(VdpOutputSurface destination_surface,
>                                       uint32_t flags)
> {
>    vlVdpOutputSurface *dst_vlsurface;
>-   vlVdpBitmapSurface *src_vlsurface;
> 
>    struct pipe_context *context;
>+   struct pipe_sampler_view *src_sv;
>    struct vl_compositor *compositor;
>    struct vl_compositor_state *cstate;
> 
>@@ -703,12 +710,19 @@ vlVdpOutputSurfaceRenderBitmapSurface(VdpOutputSurface destination_surface,
>    if (!dst_vlsurface)
>       return VDP_STATUS_INVALID_HANDLE;
> 
>-   src_vlsurface = vlGetDataHTAB(source_surface);
>-   if (!src_vlsurface)
>-      return VDP_STATUS_INVALID_HANDLE;
>+   if (source_surface == VDP_INVALID_HANDLE) {
>+      src_sv = dst_vlsurface->device->dummy_sv;
>+
>+   } else {
>+      vlVdpBitmapSurface *src_vlsurface = vlGetDataHTAB(source_surface);
>+      if (!src_vlsurface)
>+         return VDP_STATUS_INVALID_HANDLE;
> 
>-   if (dst_vlsurface->device != src_vlsurface->device)
>-      return VDP_STATUS_HANDLE_DEVICE_MISMATCH;
>+      if (dst_vlsurface->device != src_vlsurface->device)
>+         return VDP_STATUS_HANDLE_DEVICE_MISMATCH;
>+
>+      src_sv = src_vlsurface->sampler_view;
>+   }
> 
>    context = dst_vlsurface->device->context;
>    compositor = &dst_vlsurface->device->compositor;
>@@ -721,7 +735,7 @@ vlVdpOutputSurfaceRenderBitmapSurface(VdpOutputSurface destination_surface,
> 
>    vl_compositor_clear_layers(cstate);
>    vl_compositor_set_layer_blend(cstate, 0, blend, false);
>-   vl_compositor_set_rgba_layer(cstate, compositor, 0, src_vlsurface->sampler_view,
>+   vl_compositor_set_rgba_layer(cstate, compositor, 0, src_sv,
>                                 RectToPipe(source_rect, &src_rect), NULL,
>                                 ColorsToPipe(colors, flags, vlcolors));
>    vl_compositor_set_layer_rotation(cstate, 0, flags & 3);
>diff --git a/src/gallium/state_trackers/vdpau/vdpau_private.h b/src/gallium/state_trackers/vdpau/vdpau_private.h
>index 65f8e47..d1443a0 100644
>--- a/src/gallium/state_trackers/vdpau/vdpau_private.h
>+++ b/src/gallium/state_trackers/vdpau/vdpau_private.h
>@@ -348,6 +348,7 @@ typedef struct
>    struct vl_screen *vscreen;
>    struct pipe_context *context;
>    struct vl_compositor compositor;
>+   struct pipe_sampler_view *dummy_sv;
>    pipe_mutex mutex;
> 
>    struct {
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 80561: 104577

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.