diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:12:30 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:52:38 +1100 |
commit | ba72554f3e576c1674d52ab16d8d2edff9398b71 (patch) | |
tree | 317c80f33ea1edcf238d3545ff1a6104a7d55fc8 /src/gallium/state_trackers/vdpau/output.c | |
parent | be188289e1bf0e259c91a751c405d54bb99bc5d4 (diff) |
gallium/util: replace pipe_mutex_lock() with mtx_lock()
replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/vdpau/output.c')
-rw-r--r-- | src/gallium/state_trackers/vdpau/output.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c index 650628014bd..5836395bacc 100644 --- a/src/gallium/state_trackers/vdpau/output.c +++ b/src/gallium/state_trackers/vdpau/output.c @@ -92,7 +92,7 @@ vlVdpOutputSurfaceCreate(VdpDevice device, PIPE_BIND_SHARED | PIPE_BIND_SCANOUT; res_tmpl.usage = PIPE_USAGE_DEFAULT; - pipe_mutex_lock(dev->mutex); + mtx_lock(&dev->mutex); if (!CheckSurfaceParams(pipe->screen, &res_tmpl)) goto err_unlock; @@ -152,7 +152,7 @@ vlVdpOutputSurfaceDestroy(VdpOutputSurface surface) pipe = vlsurface->device->context; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); pipe_surface_reference(&vlsurface->surface, NULL); pipe_sampler_view_reference(&vlsurface->sampler_view, NULL); @@ -216,7 +216,7 @@ vlVdpOutputSurfaceGetBitsNative(VdpOutputSurface surface, if (!destination_data || !destination_pitches) return VDP_STATUS_INVALID_POINTER; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); res = vlsurface->sampler_view->texture; box = RectToPipeBox(source_rect, res); @@ -260,7 +260,7 @@ vlVdpOutputSurfacePutBitsNative(VdpOutputSurface surface, if (!source_data || !source_pitches) return VDP_STATUS_INVALID_POINTER; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); dst_box = RectToPipeBox(destination_rect, vlsurface->sampler_view->texture); @@ -344,7 +344,7 @@ vlVdpOutputSurfacePutBitsIndexed(VdpOutputSurface surface, res_tmpl.usage = PIPE_USAGE_STAGING; res_tmpl.bind = PIPE_BIND_SAMPLER_VIEW; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); if (!CheckSurfaceParams(context->screen, &res_tmpl)) goto error_resource; @@ -461,7 +461,7 @@ vlVdpOutputSurfacePutBitsYCbCr(VdpOutputSurface surface, if (!source_data || !source_pitches) return VDP_STATUS_INVALID_POINTER; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); memset(&vtmpl, 0, sizeof(vtmpl)); vtmpl.buffer_format = format; vtmpl.chroma_format = FormatYCBCRToPipeChroma(source_ycbcr_format); @@ -679,7 +679,7 @@ vlVdpOutputSurfaceRenderOutputSurface(VdpOutputSurface destination_surface, src_sv = src_vlsurface->sampler_view; } - pipe_mutex_lock(dst_vlsurface->device->mutex); + mtx_lock(&dst_vlsurface->device->mutex); context = dst_vlsurface->device->context; compositor = &dst_vlsurface->device->compositor; @@ -753,7 +753,7 @@ vlVdpOutputSurfaceRenderBitmapSurface(VdpOutputSurface destination_surface, compositor = &dst_vlsurface->device->compositor; cstate = &dst_vlsurface->cstate; - pipe_mutex_lock(dst_vlsurface->device->mutex); + mtx_lock(&dst_vlsurface->device->mutex); blend = BlenderToPipe(context, blend_state); @@ -780,7 +780,7 @@ struct pipe_resource *vlVdpOutputSurfaceGallium(VdpOutputSurface surface) if (!vlsurface || !vlsurface->surface) return NULL; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); vlsurface->device->context->flush(vlsurface->device->context, NULL, 0); pipe_mutex_unlock(vlsurface->device->mutex); @@ -801,7 +801,7 @@ VdpStatus vlVdpOutputSurfaceDMABuf(VdpOutputSurface surface, if (!vlsurface || !vlsurface->surface) return VDP_STATUS_INVALID_HANDLE; - pipe_mutex_lock(vlsurface->device->mutex); + mtx_lock(&vlsurface->device->mutex); vlsurface->device->context->flush(vlsurface->device->context, NULL, 0); memset(&whandle, 0, sizeof(struct winsys_handle)); |