[vulkan] guard fuchsia-specific code This change adds missing guards for fuchsia-specific code. Change-Id: Idc0e0cedf956e9b2079c51dbb42811defaf2399d
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index e491313..0134262 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp
@@ -34859,8 +34859,10 @@ template <typename Dispatch> class UniqueHandleTraits<Buffer,Dispatch> {public: using deleter = ObjectDestroy<Device,Dispatch>; }; using UniqueBuffer = UniqueHandle<Buffer,DispatchLoaderStatic>; +#ifdef VK_USE_PLATFORM_FUCHSIA template <typename Dispatch> class UniqueHandleTraits<BufferCollectionFUCHSIA,Dispatch> {public: using deleter = ObjectDestroy<Device,Dispatch>; }; using UniqueBufferCollectionFUCHSIA = UniqueHandle<BufferCollectionFUCHSIA,DispatchLoaderStatic>; +#endif /*VK_USE_PLATFORM_FUCHSIA*/ template <typename Dispatch> class UniqueHandleTraits<BufferView,Dispatch> {public: using deleter = ObjectDestroy<Device,Dispatch>; }; using UniqueBufferView = UniqueHandle<BufferView,DispatchLoaderStatic>; template <typename Dispatch> class UniqueHandleTraits<CommandBuffer,Dispatch> {public: using deleter = PoolFree<Device, CommandPool,Dispatch>; };
diff --git a/layers/threading.h b/layers/threading.h index a183fdb..572a997 100644 --- a/layers/threading.h +++ b/layers/threading.h
@@ -285,7 +285,9 @@ counter<VkDescriptorUpdateTemplateKHR> c_VkDescriptorUpdateTemplateKHR; counter<VkValidationCacheEXT> c_VkValidationCacheEXT; counter<VkSamplerYcbcrConversionKHR> c_VkSamplerYcbcrConversionKHR; +#ifdef __Fuchsia__ counter<VkBufferCollectionFUCHSIA> c_VkBufferCollectionFUCHSIA; +#endif counter<VkDebugUtilsMessengerEXT> c_VkDebugUtilsMessengerEXT; #else // DISTINCT_NONDISPATCHABLE_HANDLES counter<uint64_t> c_uint64_t; @@ -336,7 +338,9 @@ VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR_EXT), c_VkSamplerYcbcrConversionKHR("VkSamplerYcbcrConversionKHR", VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_KHR_EXT), +#ifdef __Fuchsia__ c_VkBufferCollectionFUCHSIA("VkBufferCollectionFUCHSIA", VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT), +#endif c_VkDebugUtilsMessengerEXT("VkDebugUtilsMessengerEXT", VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT) #else // DISTINCT_NONDISPATCHABLE_HANDLES c_uint64_t("NON_DISPATCHABLE_HANDLE", VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT) @@ -388,7 +392,9 @@ WRAPPER(VkDescriptorUpdateTemplateKHR) WRAPPER(VkValidationCacheEXT) WRAPPER(VkSamplerYcbcrConversionKHR) +#ifdef __Fuchsia__ WRAPPER(VkBufferCollectionFUCHSIA) +#endif WRAPPER(VkDebugUtilsMessengerEXT) #else // DISTINCT_NONDISPATCHABLE_HANDLES WRAPPER(uint64_t)