mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 14:56:36 +00:00
d3d11memory: Fix for wrong texture_array_size returns
Fix mismatched return values Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2051>
This commit is contained in:
parent
47bcd62d1d
commit
646c34794f
1 changed files with 3 additions and 3 deletions
|
@ -1164,9 +1164,9 @@ gst_d3d11_allocator_get_texture_array_size (GstD3D11Allocator * allocator,
|
||||||
|
|
||||||
/* For non-array-texture memory, the size is 1 */
|
/* For non-array-texture memory, the size is 1 */
|
||||||
if (array_size)
|
if (array_size)
|
||||||
*array_size = 1;
|
*array_size = priv->array_texture_size;
|
||||||
if (num_texture_in_use)
|
if (num_texture_in_use)
|
||||||
*num_texture_in_use = priv->array_texture_size;
|
*num_texture_in_use = 1;
|
||||||
|
|
||||||
/* size == 1 means we are not texture pool allocator */
|
/* size == 1 means we are not texture pool allocator */
|
||||||
if (priv->array_texture_size == 1)
|
if (priv->array_texture_size == 1)
|
||||||
|
@ -1174,7 +1174,7 @@ gst_d3d11_allocator_get_texture_array_size (GstD3D11Allocator * allocator,
|
||||||
|
|
||||||
if (num_texture_in_use) {
|
if (num_texture_in_use) {
|
||||||
GST_D3D11_ALLOCATOR_LOCK (allocator);
|
GST_D3D11_ALLOCATOR_LOCK (allocator);
|
||||||
*num_texture_in_use = priv->array_texture_size;
|
*num_texture_in_use = priv->num_array_textures_in_use;
|
||||||
GST_D3D11_ALLOCATOR_UNLOCK (allocator);
|
GST_D3D11_ALLOCATOR_UNLOCK (allocator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue