diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:06 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:53:05 +1100 |
commit | 628e84a58fdb26c63a705861b92f65f242613321 (patch) | |
tree | bd6084a4dee53a1f180c62f41e790ab490ddf3ee /src/gallium/state_trackers/vdpau/mixer.c | |
parent | ba72554f3e576c1674d52ab16d8d2edff9398b71 (diff) |
gallium/util: replace pipe_mutex_unlock() with mtx_unlock()
pipe_mutex_unlock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_unlock(\([^)]*\)):mtx_unlock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/vdpau/mixer.c')
-rw-r--r-- | src/gallium/state_trackers/vdpau/mixer.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c index a1c0377ec38..76b52255ef2 100644 --- a/src/gallium/state_trackers/vdpau/mixer.c +++ b/src/gallium/state_trackers/vdpau/mixer.c @@ -162,7 +162,7 @@ vlVdpVideoMixerCreate(VdpDevice device, } vmixer->luma_key.luma_min = 1.0f; vmixer->luma_key.luma_max = 0.0f; - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; @@ -173,7 +173,7 @@ no_handle: err_csc_matrix: vl_compositor_cleanup_state(&vmixer->cstate); no_compositor_state: - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); DeviceReference(&vmixer->device, NULL); FREE(vmixer); return ret; @@ -216,7 +216,7 @@ vlVdpVideoMixerDestroy(VdpVideoMixer mixer) vl_bicubic_filter_cleanup(vmixer->bicubic.filter); FREE(vmixer->bicubic.filter); } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); DeviceReference(&vmixer->device, NULL); FREE(vmixer); @@ -312,7 +312,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, break; default: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_PICTURE_STRUCTURE; } @@ -387,7 +387,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, for (i = 0; i < layer_count; ++i) { vlVdpOutputSurface *src = vlGetDataHTAB(layers->source_surface); if (!src) { - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_HANDLE; } @@ -454,7 +454,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, pipe_sampler_view_reference(&sampler_view, NULL); pipe_surface_reference(&surface, NULL); } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; } @@ -694,7 +694,7 @@ vlVdpVideoMixerSetFeatureEnables(VdpVideoMixer mixer, if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE)) if (!vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc, vmixer->luma_key.luma_min, vmixer->luma_key.luma_max)) { - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_ERROR; } break; @@ -705,11 +705,11 @@ vlVdpVideoMixerSetFeatureEnables(VdpVideoMixer mixer, break; default: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE; } } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; } @@ -889,11 +889,11 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer, goto fail; } } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; fail: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return ret; } @@ -987,11 +987,11 @@ vlVdpVideoMixerGetAttributeValues(VdpVideoMixer mixer, *(uint8_t*)attribute_values[i] = vmixer->skip_chroma_deint; break; default: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_ATTRIBUTE; } } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; } |