[Mesa-stable] [Mesa-dev] [PATCH] anv/image: Return early when unbinding an image

[Iago Toral]

On Tue, 2017-03-21 at 17:17 -0700, Jason Ekstrand wrote:
> Found by inspection.
> 
> Cc: "17.0 13.0" <mesa-stable at lists.freedesktop.org>
> ---
>  src/intel/vulkan/anv_image.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/intel/vulkan/anv_image.c
> b/src/intel/vulkan/anv_image.c
> index aeb144e..dfd193e 100644
> --- a/src/intel/vulkan/anv_image.c
> +++ b/src/intel/vulkan/anv_image.c
> @@ -335,14 +335,15 @@ VkResult anv_BindImageMemory(
>     ANV_FROM_HANDLE(anv_device_memory, mem, _memory);
>     ANV_FROM_HANDLE(anv_image, image, _image);
>  
> -   if (mem) {
> -      image->bo = &mem->bo;
> -      image->offset = memoryOffset;
> -   } else {
> +   if (mem == NULL) {
>        image->bo = NULL;
>        image->offset = 0;
> +      return;

return VK_SUCCESS;

Otherwise,

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>

>     }
>  
> +   image->bo = &mem->bo;
> +   image->offset = memoryOffset;
> +
>     if (image->aux_surface.isl.size > 0) {
>  
>        /* The offset and size must be a multiple of 4K or else the