diff options
author | 2016-03-26 06:56:45 +0800 | |
---|---|---|
committer | 2016-04-11 07:37:19 +0800 | |
commit | c96880f2cd1d34ffb9e3d10d80f0a3ddcc5579a8 (patch) | |
tree | f4c44ad9566ecc6ccb2ff57914c5d17160154cd1 /vulkan/libvulkan/loader.h | |
parent | ff4a6c772aaf3ff0b71348647330031a059b1f51 (diff) |
vulkan: add layers_extensions.h
Move everything for layers_extensions.cpp out of loader.h to
layers_extensions.h, and into vulkan::api namespace.
Remove now unused InstanceExtensionFromName and DeviceExtensionFromName.
Change-Id: I06be98986f40de35e9dffb5499bc1423e9eb3d48
Diffstat (limited to 'vulkan/libvulkan/loader.h')
-rw-r--r-- | vulkan/libvulkan/loader.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/vulkan/libvulkan/loader.h b/vulkan/libvulkan/loader.h index a150dc52ae..94448b5d10 100644 --- a/vulkan/libvulkan/loader.h +++ b/vulkan/libvulkan/loader.h @@ -26,21 +26,6 @@ struct hwvulkan_device_t; namespace vulkan { -enum InstanceExtension { - kKHR_surface, - kKHR_android_surface, - kEXT_debug_report, - kInstanceExtensionCount -}; -typedef std::bitset<kInstanceExtensionCount> InstanceExtensionSet; - -enum DeviceExtension { - kKHR_swapchain, - kANDROID_native_buffer, - kDeviceExtensionCount -}; -typedef std::bitset<kDeviceExtensionCount> DeviceExtensionSet; - // ----------------------------------------------------------------------------- // loader.cpp @@ -69,48 +54,6 @@ VKAPI_ATTR VkResult AcquireNextImageKHR_Bottom(VkDevice device, VkSwapchainKHR s VKAPI_ATTR VkResult QueuePresentKHR_Bottom(VkQueue queue, const VkPresentInfoKHR* present_info); // clang-format on -// ----------------------------------------------------------------------------- -// layers_extensions.cpp - -struct Layer; -class LayerRef { - public: - LayerRef(Layer* layer); - LayerRef(LayerRef&& other); - ~LayerRef(); - LayerRef(const LayerRef&) = delete; - LayerRef& operator=(const LayerRef&) = delete; - - const char* GetName() const; - uint32_t GetSpecVersion(); - - // provides bool-like behavior - operator const Layer*() const { return layer_; } - - PFN_vkGetInstanceProcAddr GetGetInstanceProcAddr() const; - PFN_vkGetDeviceProcAddr GetGetDeviceProcAddr() const; - - bool SupportsExtension(const char* name) const; - - private: - Layer* layer_; -}; - -void DiscoverLayers(); -uint32_t EnumerateInstanceLayers(uint32_t count, VkLayerProperties* properties); -uint32_t EnumerateDeviceLayers(uint32_t count, VkLayerProperties* properties); -void GetInstanceLayerExtensions(const char* name, - const VkExtensionProperties** properties, - uint32_t* count); -void GetDeviceLayerExtensions(const char* name, - const VkExtensionProperties** properties, - uint32_t* count); -LayerRef GetInstanceLayerRef(const char* name); -LayerRef GetDeviceLayerRef(const char* name); - -InstanceExtension InstanceExtensionFromName(const char* name); -DeviceExtension DeviceExtensionFromName(const char* name); - } // namespace vulkan #endif // LIBVULKAN_LOADER_H |