diff --git a/src/nouveau/vulkan/meson.build b/src/nouveau/vulkan/meson.build index afdaffc9b6f..5897830bcc5 100644 --- a/src/nouveau/vulkan/meson.build +++ b/src/nouveau/vulkan/meson.build @@ -132,7 +132,7 @@ nvk_deps = [ nvk_flags = [] if with_platform_android - nvk_deps += [dep_android, idep_u_gralloc] + nvk_deps += [dep_android] nvk_flags += '-DVK_USE_PLATFORM_ANDROID_KHR' nvk_files += files('nvk_android.c') endif diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index e0fe019c7bd..67bc5493ce3 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -22,11 +22,6 @@ #include "util/disk_cache.h" #include "util/mesa-sha1.h" -#if DETECT_OS_ANDROID -#include -#include "util/u_gralloc/u_gralloc.h" -#endif - #include "vk_android.h" #include "vk_device.h" #include "vk_drm_syncobj.h" @@ -286,8 +281,7 @@ nvk_get_device_extensions(const struct nvk_instance *instance, .EXT_ycbcr_image_arrays = true, .EXT_zero_initialize_device_memory = true, #if DETECT_OS_ANDROID - .ANDROID_native_buffer = vk_android_get_ugralloc() && - u_gralloc_get_type(vk_android_get_ugralloc()) != U_GRALLOC_TYPE_FALLBACK, + .ANDROID_native_buffer = vk_android_get_ugralloc() != NULL, #endif .GOOGLE_decorate_string = true, .GOOGLE_hlsl_functionality1 = true,