anv/android: Use an address for each anv_image plane
authorMauro Rossi <issor.oruam@gmail.com>
Sun, 3 Jun 2018 18:41:59 +0000 (20:41 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Tue, 12 Jun 2018 08:17:43 +0000 (11:17 +0300)
Fixes to avoid building error after change in image->planes[] structure,
{bo,bo_offset} has to be replaced by address.{bo,offset}
and update is needed also in the assert() for debug builds.

external/mesa/src/intel/vulkan/anv_android.c:188:21:
error: no member named 'bo' in 'struct anv_image::(anonymous at external/mesa/src/intel/vulkan/anv_private.h:2647:4)'
   image->planes[0].bo = bo;
   ~~~~~~~~~~~~~~~~ ^
1 error generated.

Fixes: bf34ef16ac ("anv: Use an address for each anv_image plane")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/intel/vulkan/anv_android.c

index 6e4d5a6d2772b51f236d77939f1c97b0cb08a27d..3c905d3bdb5fbb55eb756d76e240a9b7f6218750 100644 (file)
@@ -189,9 +189,9 @@ anv_image_from_gralloc(VkDevice device_h,
    }
 
    assert(image->n_planes == 1);
-   assert(image->planes[0].bo_offset == 0);
+   assert(image->planes[0].address.offset == 0);
 
-   image->planes[0].bo = bo;
+   image->planes[0].address.bo = bo;
    image->planes[0].bo_is_owned = true;
 
    /* We need to set the WRITE flag on window system buffers so that GEM will