Mesa (master): anv: Pass device to setup_gralloc0_usage for error reporting
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 5 18:25:46 UTC 2020
Module: Mesa
Branch: master
Commit: ff0dbf2096148ef7513baa78646809826b7f42b4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ff0dbf2096148ef7513baa78646809826b7f42b4
Author: Kristian H. Kristensen <hoegsberg at google.com>
Date: Wed Jul 29 11:02:07 2020 -0700
anv: Pass device to setup_gralloc0_usage for error reporting
Otherwise it doesn't compile.
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Fixes: aba57b11ee8c6d ("anv: support GetSwapchainGrallocUsage2ANDROID for Android")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6112>
---
src/intel/vulkan/anv_android.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c
index 8e6d0b65ea1..a5f5904d06b 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
More information about the mesa-commit
mailing list