diff options
| author | Kristian H. Kristensen <hoegsberg@google.com> | 2020-07-29 11:02:07 -0700 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-08-05 22:23:21 +0200 |
| commit | 65a6b36802617e780077cae586ab83c38e4ce5bb (patch) | |
| tree | 916b325dedd9d44313b8a3d5646fedad1d47d0ba /src | |
| parent | d1ac2ffeb6d53df59182a41e87abc086d71c79c9 (diff) | |
anv: Pass device to setup_gralloc0_usage for error reporting
Otherwise it doesn't compile.
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: aba57b11ee8c6d ("anv: support GetSwapchainGrallocUsage2ANDROID for Android")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6112>
(cherry picked from commit ff0dbf2096148ef7513baa78646809826b7f42b4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/vulkan/anv_android.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index b46a990b32e..06623f4baa0 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -572,8 +572,8 @@ format_supported_with_usage(VkDevice device_h, VkFormat format, static VkResult -setup_gralloc0_usage(VkFormat format, VkImageUsageFlags imageUsage, - int *grallocUsage) +setup_gralloc0_usage(struct anv_device *device, VkFormat format, + VkImageUsageFlags imageUsage, int *grallocUsage) { /* WARNING: Android's libvulkan.so hardcodes the VkImageUsageFlags * returned to applications via VkSurfaceCapabilitiesKHR::supportedUsageFlags. @@ -654,7 +654,7 @@ VkResult anv_GetSwapchainGrallocUsage2ANDROID( return result; int32_t grallocUsage = 0; - result = setup_gralloc0_usage(format, imageUsage, &grallocUsage); + result = setup_gralloc0_usage(device, format, imageUsage, &grallocUsage); if (result != VK_SUCCESS) return result; @@ -686,6 +686,7 @@ VkResult anv_GetSwapchainGrallocUsageANDROID( VkImageUsageFlags imageUsage, int* grallocUsage) { + ANV_FROM_HANDLE(anv_device, device, device_h); VkResult result; *grallocUsage = 0; @@ -695,7 +696,7 @@ VkResult anv_GetSwapchainGrallocUsageANDROID( if (result != VK_SUCCESS) return result; - return setup_gralloc0_usage(format, imageUsage, grallocUsage); + return setup_gralloc0_usage(device, format, imageUsage, grallocUsage); } VkResult |