gallium/util: replace pipe_mutex_lock() with mtx_lock()

[mesa.git] / src / gallium / state_trackers / vdpau / bitmap.c

diff --git a/src/gallium/state_trackers/vdpau/bitmap.c b/src/gallium/state_trackers/vdpau/bitmap.c
index c2c8a448ce625d56c62e1126c08656e1f048452b..14f6c36c6cc123adccaff3233d9932e611f368ed 100644 (file)
--- a/src/gallium/state_trackers/vdpau/bitmap.c
+++ b/src/gallium/state_trackers/vdpau/bitmap.c
@@ -18,7 +18,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -45,6 +45,7 @@ vlVdpBitmapSurfaceCreate(VdpDevice device,
    struct pipe_context *pipe;
    struct pipe_resource res_tmpl, *res;
    struct pipe_sampler_view sv_templ;
+   VdpStatus ret;
 
    vlVdpBitmapSurface *vlsurface = NULL;
 
@@ -66,43 +67,59 @@ vlVdpBitmapSurfaceCreate(VdpDevice device,
    if (!vlsurface)
       return VDP_STATUS_RESOURCES;
 
-   vlsurface->device = dev;
+   DeviceReference(&vlsurface->device, dev);
 
    memset(&res_tmpl, 0, sizeof(res_tmpl));
-
    res_tmpl.target = PIPE_TEXTURE_2D;
-   res_tmpl.format = FormatRGBAToPipe(rgba_format);
+   res_tmpl.format = VdpFormatRGBAToPipe(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_tmpl.usage = frequently_accessed ? PIPE_USAGE_DYNAMIC : PIPE_USAGE_DEFAULT;
+
+   mtx_lock(&dev->mutex);
+
+   if (!CheckSurfaceParams(pipe->screen, &res_tmpl)) {
+      ret = VDP_STATUS_RESOURCES;
+      goto err_unlock;
+   }
+
    res = pipe->screen->resource_create(pipe->screen, &res_tmpl);
    if (!res) {
-      FREE(dev);
-      return VDP_STATUS_RESOURCES;
+      ret = VDP_STATUS_RESOURCES;
+      goto err_unlock;
    }
 
-   memset(&sv_templ, 0, sizeof(sv_templ));
-   u_sampler_view_default_template(&sv_templ, res, res->format);
+   vlVdpDefaultSamplerViewTemplate(&sv_templ, res);
    vlsurface->sampler_view = pipe->create_sampler_view(pipe, res, &sv_templ);
+
+   pipe_resource_reference(&res, NULL);
+
    if (!vlsurface->sampler_view) {
-      pipe_resource_reference(&res, NULL);
-      FREE(dev);
-      return VDP_STATUS_RESOURCES;
+      ret = VDP_STATUS_RESOURCES;
+      goto err_unlock;
    }
 
+   pipe_mutex_unlock(dev->mutex);
+
    *surface = vlAddDataHTAB(vlsurface);
    if (*surface == 0) {
-      pipe_resource_reference(&res, NULL);
-      FREE(dev);
-      return VDP_STATUS_ERROR;
+      mtx_lock(&dev->mutex);
+      ret = VDP_STATUS_ERROR;
+      goto err_sampler;
    }
 
-   pipe_resource_reference(&res, NULL);
-
    return VDP_STATUS_OK;
+
+err_sampler:
+   pipe_sampler_view_reference(&vlsurface->sampler_view, NULL);
+err_unlock:
+   pipe_mutex_unlock(dev->mutex);
+   DeviceReference(&vlsurface->device, NULL);
+   FREE(vlsurface);
+   return ret;
 }
 
 /**
@@ -117,11 +134,12 @@ vlVdpBitmapSurfaceDestroy(VdpBitmapSurface surface)
    if (!vlsurface)
       return VDP_STATUS_INVALID_HANDLE;
 
-   vlVdpResolveDelayedRendering(vlsurface->device, NULL, NULL);
-
+   mtx_lock(&vlsurface->device->mutex);
    pipe_sampler_view_reference(&vlsurface->sampler_view, NULL);
+   pipe_mutex_unlock(vlsurface->device->mutex);
 
    vlRemoveDataHTAB(surface);
+   DeviceReference(&vlsurface->device, NULL);
    FREE(vlsurface);
 
    return VDP_STATUS_OK;
@@ -136,10 +154,23 @@ vlVdpBitmapSurfaceGetParameters(VdpBitmapSurface surface,
                                 uint32_t *width, uint32_t *height,
                                 VdpBool *frequently_accessed)
 {
+   vlVdpBitmapSurface *vlsurface;
+   struct pipe_resource *res;
+
+   vlsurface = vlGetDataHTAB(surface);
+   if (!vlsurface)
+      return VDP_STATUS_INVALID_HANDLE;
+
    if (!(rgba_format && width && height && frequently_accessed))
       return VDP_STATUS_INVALID_POINTER;
 
-   return VDP_STATUS_NO_IMPLEMENTATION;
+   res = vlsurface->sampler_view->texture;
+   *rgba_format = PipeToFormatRGBA(res->format);
+   *width = res->width0;
+   *height = res->height0;
+   *frequently_accessed = res->usage == PIPE_USAGE_DYNAMIC;
+
+   return VDP_STATUS_OK;
 }
 
 /**
@@ -165,24 +196,14 @@ vlVdpBitmapSurfacePutBitsNative(VdpBitmapSurface surface,
 
    pipe = vlsurface->device->context;
 
-   vlVdpResolveDelayedRendering(vlsurface->device, NULL, NULL);
+   mtx_lock(&vlsurface->device->mutex);
 
-   dst_box.x = 0;
-   dst_box.y = 0;
-   dst_box.z = 0;
-   dst_box.width = vlsurface->sampler_view->texture->width0;
-   dst_box.height = vlsurface->sampler_view->texture->height0;
-   dst_box.depth = 1;
+   dst_box = RectToPipeBox(destination_rect, vlsurface->sampler_view->texture);
+   pipe->texture_subdata(pipe, vlsurface->sampler_view->texture, 0,
+                         PIPE_TRANSFER_WRITE, &dst_box, *source_data,
+                         *source_pitches, 0);
 
-   if (destination_rect) {
-      dst_box.x = MIN2(destination_rect->x0, destination_rect->x1);
-      dst_box.y = MIN2(destination_rect->y0, destination_rect->y1);
-      dst_box.width = abs(destination_rect->x1 - destination_rect->x0);
-      dst_box.height = abs(destination_rect->y1 - destination_rect->y0);
-   }
+   pipe_mutex_unlock(vlsurface->device->mutex);
 
-   pipe->transfer_inline_write(pipe, vlsurface->sampler_view->texture, 0,
-                               PIPE_TRANSFER_WRITE, &dst_box, *source_data,
-                               *source_pitches, 0);
    return VDP_STATUS_OK;
 }