Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 1 | // |
| 2 | // Copyright 2016 The ANGLE Project Authors. All rights reserved. |
| 3 | // Use of this source code is governed by a BSD-style license that can be |
| 4 | // found in the LICENSE file. |
| 5 | // |
| 6 | // RendererVk.cpp: |
| 7 | // Implements the class methods for RendererVk. |
| 8 | // |
| 9 | |
| 10 | #include "libANGLE/renderer/vulkan/RendererVk.h" |
| 11 | |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 12 | // Placing this first seems to solve an intellisense bug. |
Jamie Madill | 3c424b4 | 2018-01-19 12:35:09 -0500 | [diff] [blame] | 13 | #include "libANGLE/renderer/vulkan/vk_utils.h" |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 14 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 15 | #include <EGL/eglext.h> |
| 16 | |
Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 17 | #include "common/debug.h" |
Jamie Madill | a66779f | 2017-01-06 10:43:44 -0500 | [diff] [blame] | 18 | #include "common/system_utils.h" |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 19 | #include "libANGLE/Display.h" |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 20 | #include "libANGLE/renderer/driver_utils.h" |
Jamie Madill | 1f46bc1 | 2018-02-20 16:09:43 -0500 | [diff] [blame] | 21 | #include "libANGLE/renderer/vulkan/CommandGraph.h" |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 22 | #include "libANGLE/renderer/vulkan/CompilerVk.h" |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 23 | #include "libANGLE/renderer/vulkan/DisplayVk.h" |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 24 | #include "libANGLE/renderer/vulkan/FramebufferVk.h" |
Jamie Madill | 8ecf7f9 | 2017-01-13 17:29:52 -0500 | [diff] [blame] | 25 | #include "libANGLE/renderer/vulkan/GlslangWrapper.h" |
Jamie Madill | ffa4cbb | 2018-01-23 13:04:07 -0500 | [diff] [blame] | 26 | #include "libANGLE/renderer/vulkan/ProgramVk.h" |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 27 | #include "libANGLE/renderer/vulkan/VertexArrayVk.h" |
Luc Ferron | e4741fd | 2018-01-25 13:25:27 -0500 | [diff] [blame] | 28 | #include "libANGLE/renderer/vulkan/vk_caps_utils.h" |
Jamie Madill | 3c424b4 | 2018-01-19 12:35:09 -0500 | [diff] [blame] | 29 | #include "libANGLE/renderer/vulkan/vk_format_utils.h" |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 30 | #include "platform/Platform.h" |
Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 31 | |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 32 | #include "third_party/trace_event/trace_event.h" |
| 33 | |
Tobin Ehlis | a3b220f | 2018-03-06 16:22:13 -0700 | [diff] [blame] | 34 | // Consts |
| 35 | namespace |
| 36 | { |
| 37 | const uint32_t kMockVendorID = 0xba5eba11; |
| 38 | const uint32_t kMockDeviceID = 0xf005ba11; |
| 39 | constexpr char kMockDeviceName[] = "Vulkan Mock Device"; |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 40 | constexpr size_t kInFlightCommandsLimit = 100u; |
Tobin Ehlis | a3b220f | 2018-03-06 16:22:13 -0700 | [diff] [blame] | 41 | } // anonymous namespace |
| 42 | |
Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 43 | namespace rx |
| 44 | { |
| 45 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 46 | namespace |
| 47 | { |
Luc Ferron | daedf4d | 2018-03-16 09:28:53 -0400 | [diff] [blame] | 48 | // We currently only allocate 2 uniform buffer per descriptor set, one for the fragment shader and |
| 49 | // one for the vertex shader. |
| 50 | constexpr size_t kUniformBufferDescriptorsPerDescriptorSet = 2; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 51 | // Update the pipeline cache every this many swaps (if 60fps, this means every 10 minutes) |
| 52 | static constexpr uint32_t kPipelineCacheVkUpdatePeriod = 10 * 60 * 60; |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 53 | // Wait a maximum of 10s. If that times out, we declare it a failure. |
| 54 | static constexpr uint64_t kMaxFenceWaitTimeNs = 10'000'000'000llu; |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 55 | |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 56 | bool ShouldEnableMockICD(const egl::AttributeMap &attribs) |
| 57 | { |
| 58 | #if !defined(ANGLE_PLATFORM_ANDROID) |
| 59 | // Mock ICD does not currently run on Android |
| 60 | return (attribs.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, |
| 61 | EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE) == |
| 62 | EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE); |
| 63 | #else |
| 64 | return false; |
| 65 | #endif // !defined(ANGLE_PLATFORM_ANDROID) |
| 66 | } |
| 67 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 68 | VkResult VerifyExtensionsPresent(const std::vector<VkExtensionProperties> &extensionProps, |
| 69 | const std::vector<const char *> &enabledExtensionNames) |
| 70 | { |
| 71 | // Compile the extensions names into a set. |
| 72 | std::set<std::string> extensionNames; |
| 73 | for (const auto &extensionProp : extensionProps) |
| 74 | { |
| 75 | extensionNames.insert(extensionProp.extensionName); |
| 76 | } |
| 77 | |
Jamie Madill | acf2f3a | 2017-11-21 19:22:44 -0500 | [diff] [blame] | 78 | for (const char *extensionName : enabledExtensionNames) |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 79 | { |
| 80 | if (extensionNames.count(extensionName) == 0) |
| 81 | { |
| 82 | return VK_ERROR_EXTENSION_NOT_PRESENT; |
| 83 | } |
| 84 | } |
| 85 | |
| 86 | return VK_SUCCESS; |
| 87 | } |
| 88 | |
Tobin Ehlis | 3a181e3 | 2018-08-29 15:17:05 -0600 | [diff] [blame] | 89 | // Array of Validation error/warning messages that will be ignored, should include bugID |
| 90 | constexpr std::array<const char *, 1> kSkippedMessages = { |
| 91 | // http://anglebug.com/2796 |
| 92 | " [ UNASSIGNED-CoreValidation-Shader-PointSizeMissing ] Object: VK_NULL_HANDLE (Type = 19) " |
| 93 | "| Pipeline topology is set to POINT_LIST, but PointSize is not written to in the shader " |
| 94 | "corresponding to VK_SHADER_STAGE_VERTEX_BIT."}; |
| 95 | |
| 96 | // Suppress validation errors that are known |
| 97 | // return "true" if given code/prefix/message is known, else return "false" |
| 98 | bool IsIgnoredDebugMessage(const char *message) |
| 99 | { |
| 100 | for (const auto &msg : kSkippedMessages) |
| 101 | { |
| 102 | if (strcmp(msg, message) == 0) |
| 103 | { |
| 104 | return true; |
| 105 | } |
| 106 | } |
| 107 | return false; |
| 108 | } |
| 109 | |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 110 | VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(VkDebugReportFlagsEXT flags, |
| 111 | VkDebugReportObjectTypeEXT objectType, |
| 112 | uint64_t object, |
| 113 | size_t location, |
| 114 | int32_t messageCode, |
| 115 | const char *layerPrefix, |
| 116 | const char *message, |
| 117 | void *userData) |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 118 | { |
Tobin Ehlis | 3a181e3 | 2018-08-29 15:17:05 -0600 | [diff] [blame] | 119 | if (IsIgnoredDebugMessage(message)) |
| 120 | { |
| 121 | return VK_FALSE; |
| 122 | } |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 123 | if ((flags & VK_DEBUG_REPORT_ERROR_BIT_EXT) != 0) |
| 124 | { |
Yuly Novikov | bcb3f9b | 2017-01-27 22:45:18 -0500 | [diff] [blame] | 125 | ERR() << message; |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 126 | #if !defined(NDEBUG) |
| 127 | // Abort the call in Debug builds. |
| 128 | return VK_TRUE; |
| 129 | #endif |
| 130 | } |
| 131 | else if ((flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) != 0) |
| 132 | { |
Yuly Novikov | bcb3f9b | 2017-01-27 22:45:18 -0500 | [diff] [blame] | 133 | WARN() << message; |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 134 | } |
| 135 | else |
| 136 | { |
Yuly Novikov | bcb3f9b | 2017-01-27 22:45:18 -0500 | [diff] [blame] | 137 | // Uncomment this if you want Vulkan spam. |
| 138 | // WARN() << message; |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 139 | } |
| 140 | |
| 141 | return VK_FALSE; |
| 142 | } |
| 143 | |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 144 | // If we're loading the validation layers, we could be running from any random directory. |
| 145 | // Change to the executable directory so we can find the layers, then change back to the |
| 146 | // previous directory to be safe we don't disrupt the application. |
| 147 | class ScopedVkLoaderEnvironment : angle::NonCopyable |
| 148 | { |
| 149 | public: |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 150 | ScopedVkLoaderEnvironment(bool enableValidationLayers, bool enableMockICD) |
| 151 | : mEnableValidationLayers(enableValidationLayers), |
| 152 | mEnableMockICD(enableMockICD), |
| 153 | mChangedCWD(false), |
| 154 | mChangedICDPath(false) |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 155 | { |
| 156 | // Changing CWD and setting environment variables makes no sense on Android, |
| 157 | // since this code is a part of Java application there. |
| 158 | // Android Vulkan loader doesn't need this either. |
| 159 | #if !defined(ANGLE_PLATFORM_ANDROID) |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 160 | if (enableMockICD) |
| 161 | { |
| 162 | // Override environment variable to use built Mock ICD |
| 163 | // ANGLE_VK_ICD_JSON gets set to the built mock ICD in BUILD.gn |
| 164 | mPreviousICDPath = angle::GetEnvironmentVar(g_VkICDPathEnv); |
| 165 | mChangedICDPath = angle::SetEnvironmentVar(g_VkICDPathEnv, ANGLE_VK_ICD_JSON); |
| 166 | if (!mChangedICDPath) |
| 167 | { |
| 168 | ERR() << "Error setting Path for Mock/Null Driver."; |
| 169 | mEnableMockICD = false; |
| 170 | } |
| 171 | } |
Jamie Madill | 4684842 | 2018-08-09 10:46:06 -0400 | [diff] [blame] | 172 | if (mEnableValidationLayers || mEnableMockICD) |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 173 | { |
| 174 | const auto &cwd = angle::GetCWD(); |
| 175 | if (!cwd.valid()) |
| 176 | { |
| 177 | ERR() << "Error getting CWD for Vulkan layers init."; |
| 178 | mEnableValidationLayers = false; |
Jamie Madill | 4684842 | 2018-08-09 10:46:06 -0400 | [diff] [blame] | 179 | mEnableMockICD = false; |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 180 | } |
| 181 | else |
| 182 | { |
| 183 | mPreviousCWD = cwd.value(); |
| 184 | const char *exeDir = angle::GetExecutableDirectory(); |
| 185 | mChangedCWD = angle::SetCWD(exeDir); |
| 186 | if (!mChangedCWD) |
| 187 | { |
| 188 | ERR() << "Error setting CWD for Vulkan layers init."; |
| 189 | mEnableValidationLayers = false; |
Jamie Madill | 4684842 | 2018-08-09 10:46:06 -0400 | [diff] [blame] | 190 | mEnableMockICD = false; |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 191 | } |
| 192 | } |
| 193 | } |
| 194 | |
| 195 | // Override environment variable to use the ANGLE layers. |
| 196 | if (mEnableValidationLayers) |
| 197 | { |
Tobin Ehlis | a3b220f | 2018-03-06 16:22:13 -0700 | [diff] [blame] | 198 | if (!angle::PrependPathToEnvironmentVar(g_VkLoaderLayersPathEnv, ANGLE_VK_DATA_DIR)) |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 199 | { |
| 200 | ERR() << "Error setting environment for Vulkan layers init."; |
| 201 | mEnableValidationLayers = false; |
| 202 | } |
| 203 | } |
| 204 | #endif // !defined(ANGLE_PLATFORM_ANDROID) |
| 205 | } |
| 206 | |
| 207 | ~ScopedVkLoaderEnvironment() |
| 208 | { |
| 209 | if (mChangedCWD) |
| 210 | { |
| 211 | #if !defined(ANGLE_PLATFORM_ANDROID) |
| 212 | ASSERT(mPreviousCWD.valid()); |
| 213 | angle::SetCWD(mPreviousCWD.value().c_str()); |
| 214 | #endif // !defined(ANGLE_PLATFORM_ANDROID) |
| 215 | } |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 216 | if (mChangedICDPath) |
| 217 | { |
Omar El Sheikh | 80d4ef1 | 2018-07-13 17:08:19 -0600 | [diff] [blame] | 218 | if (mPreviousICDPath.value().empty()) |
| 219 | { |
| 220 | angle::UnsetEnvironmentVar(g_VkICDPathEnv); |
| 221 | } |
| 222 | else |
| 223 | { |
| 224 | angle::SetEnvironmentVar(g_VkICDPathEnv, mPreviousICDPath.value().c_str()); |
| 225 | } |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 226 | } |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 227 | } |
| 228 | |
Jamie Madill | aaca96e | 2018-06-12 10:19:48 -0400 | [diff] [blame] | 229 | bool canEnableValidationLayers() const { return mEnableValidationLayers; } |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 230 | |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 231 | bool canEnableMockICD() const { return mEnableMockICD; } |
| 232 | |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 233 | private: |
| 234 | bool mEnableValidationLayers; |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 235 | bool mEnableMockICD; |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 236 | bool mChangedCWD; |
| 237 | Optional<std::string> mPreviousCWD; |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 238 | bool mChangedICDPath; |
| 239 | Optional<std::string> mPreviousICDPath; |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 240 | }; |
| 241 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 242 | void ChoosePhysicalDevice(const std::vector<VkPhysicalDevice> &physicalDevices, |
| 243 | bool preferMockICD, |
| 244 | VkPhysicalDevice *physicalDeviceOut, |
| 245 | VkPhysicalDeviceProperties *physicalDevicePropertiesOut) |
| 246 | { |
| 247 | ASSERT(!physicalDevices.empty()); |
| 248 | if (preferMockICD) |
| 249 | { |
| 250 | for (const VkPhysicalDevice &physicalDevice : physicalDevices) |
| 251 | { |
| 252 | vkGetPhysicalDeviceProperties(physicalDevice, physicalDevicePropertiesOut); |
| 253 | if ((kMockVendorID == physicalDevicePropertiesOut->vendorID) && |
| 254 | (kMockDeviceID == physicalDevicePropertiesOut->deviceID) && |
| 255 | (strcmp(kMockDeviceName, physicalDevicePropertiesOut->deviceName) == 0)) |
| 256 | { |
| 257 | *physicalDeviceOut = physicalDevice; |
| 258 | return; |
| 259 | } |
| 260 | } |
| 261 | WARN() << "Vulkan Mock Driver was requested but Mock Device was not found. Using default " |
| 262 | "physicalDevice instead."; |
| 263 | } |
| 264 | |
| 265 | // Fall back to first device. |
| 266 | *physicalDeviceOut = physicalDevices[0]; |
| 267 | vkGetPhysicalDeviceProperties(*physicalDeviceOut, physicalDevicePropertiesOut); |
| 268 | } |
Jamie Madill | 0da73fe | 2018-10-02 09:31:39 -0400 | [diff] [blame] | 269 | |
| 270 | // Initially dumping the command graphs is disabled. |
| 271 | constexpr bool kEnableCommandGraphDiagnostics = false; |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 272 | } // anonymous namespace |
| 273 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 274 | // CommandBatch implementation. |
Jamie Madill | aaca96e | 2018-06-12 10:19:48 -0400 | [diff] [blame] | 275 | RendererVk::CommandBatch::CommandBatch() = default; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 276 | |
Jamie Madill | aaca96e | 2018-06-12 10:19:48 -0400 | [diff] [blame] | 277 | RendererVk::CommandBatch::~CommandBatch() = default; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 278 | |
| 279 | RendererVk::CommandBatch::CommandBatch(CommandBatch &&other) |
| 280 | : commandPool(std::move(other.commandPool)), fence(std::move(other.fence)), serial(other.serial) |
| 281 | { |
| 282 | } |
| 283 | |
| 284 | RendererVk::CommandBatch &RendererVk::CommandBatch::operator=(CommandBatch &&other) |
| 285 | { |
| 286 | std::swap(commandPool, other.commandPool); |
| 287 | std::swap(fence, other.fence); |
| 288 | std::swap(serial, other.serial); |
| 289 | return *this; |
| 290 | } |
| 291 | |
Jamie Madill | bea35a6 | 2018-07-05 11:54:10 -0400 | [diff] [blame] | 292 | void RendererVk::CommandBatch::destroy(VkDevice device) |
| 293 | { |
| 294 | commandPool.destroy(device); |
| 295 | fence.destroy(device); |
| 296 | } |
| 297 | |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 298 | // RendererVk implementation. |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 299 | RendererVk::RendererVk() |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 300 | : mDisplay(nullptr), |
| 301 | mCapsInitialized(false), |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 302 | mInstance(VK_NULL_HANDLE), |
| 303 | mEnableValidationLayers(false), |
Jamie Madill | 0ea9621 | 2018-10-30 15:14:51 -0400 | [diff] [blame] | 304 | mEnableMockICD(false), |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 305 | mDebugReportCallback(VK_NULL_HANDLE), |
| 306 | mPhysicalDevice(VK_NULL_HANDLE), |
| 307 | mQueue(VK_NULL_HANDLE), |
| 308 | mCurrentQueueFamilyIndex(std::numeric_limits<uint32_t>::max()), |
| 309 | mDevice(VK_NULL_HANDLE), |
Jamie Madill | fb05bcb | 2017-06-07 15:43:18 -0400 | [diff] [blame] | 310 | mLastCompletedQueueSerial(mQueueSerialFactory.generate()), |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 311 | mCurrentQueueSerial(mQueueSerialFactory.generate()), |
Geoff Lang | 2fe5e1d | 2018-08-28 14:00:24 -0400 | [diff] [blame] | 312 | mDeviceLost(false), |
Jamie Madill | 0da73fe | 2018-10-02 09:31:39 -0400 | [diff] [blame] | 313 | mPipelineCacheVkUpdateTimeout(kPipelineCacheVkUpdatePeriod), |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 314 | mCommandGraph(kEnableCommandGraphDiagnostics), |
| 315 | mGpuEventsEnabled(false), |
| 316 | mGpuClockSync{std::numeric_limits<double>::max(), std::numeric_limits<double>::max()}, |
| 317 | mGpuEventTimestampOrigin(0) |
Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 318 | { |
| 319 | } |
| 320 | |
| 321 | RendererVk::~RendererVk() |
| 322 | { |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 323 | } |
| 324 | |
| 325 | void RendererVk::onDestroy(vk::Context *context) |
| 326 | { |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 327 | if (!mInFlightCommands.empty() || !mGarbage.empty()) |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 328 | { |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 329 | // TODO(jmadill): Not nice to pass nullptr here, but shouldn't be a problem. |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 330 | (void)finish(context); |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 331 | } |
| 332 | |
Jamie Madill | c7918ce | 2018-06-13 13:25:31 -0400 | [diff] [blame] | 333 | mPipelineLayoutCache.destroy(mDevice); |
| 334 | mDescriptorSetLayoutCache.destroy(mDevice); |
| 335 | |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 336 | mFullScreenClearShaderProgram.destroy(mDevice); |
| 337 | |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 338 | mRenderPassCache.destroy(mDevice); |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 339 | mPipelineCache.destroy(mDevice); |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 340 | mSubmitSemaphorePool.destroy(mDevice); |
Jamie Madill | d47044a | 2018-04-27 11:45:03 -0400 | [diff] [blame] | 341 | mShaderLibrary.destroy(mDevice); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 342 | mGpuEventQueryPool.destroy(mDevice); |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 343 | |
Jamie Madill | 06ca634 | 2018-07-12 15:56:53 -0400 | [diff] [blame] | 344 | GlslangWrapper::Release(); |
Jamie Madill | 8ecf7f9 | 2017-01-13 17:29:52 -0500 | [diff] [blame] | 345 | |
Jamie Madill | 5deea72 | 2017-02-16 10:44:46 -0500 | [diff] [blame] | 346 | if (mCommandPool.valid()) |
| 347 | { |
| 348 | mCommandPool.destroy(mDevice); |
| 349 | } |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 350 | |
| 351 | if (mDevice) |
| 352 | { |
| 353 | vkDestroyDevice(mDevice, nullptr); |
| 354 | mDevice = VK_NULL_HANDLE; |
| 355 | } |
| 356 | |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 357 | if (mDebugReportCallback) |
| 358 | { |
| 359 | ASSERT(mInstance); |
| 360 | auto destroyDebugReportCallback = reinterpret_cast<PFN_vkDestroyDebugReportCallbackEXT>( |
| 361 | vkGetInstanceProcAddr(mInstance, "vkDestroyDebugReportCallbackEXT")); |
| 362 | ASSERT(destroyDebugReportCallback); |
| 363 | destroyDebugReportCallback(mInstance, mDebugReportCallback, nullptr); |
| 364 | } |
| 365 | |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 366 | if (mInstance) |
| 367 | { |
| 368 | vkDestroyInstance(mInstance, nullptr); |
| 369 | mInstance = VK_NULL_HANDLE; |
| 370 | } |
| 371 | |
Omar El Sheikh | eb4b869 | 2018-07-17 10:55:40 -0600 | [diff] [blame] | 372 | mMemoryProperties.destroy(); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 373 | mPhysicalDevice = VK_NULL_HANDLE; |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 374 | } |
| 375 | |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 376 | void RendererVk::notifyDeviceLost() |
Geoff Lang | 2fe5e1d | 2018-08-28 14:00:24 -0400 | [diff] [blame] | 377 | { |
| 378 | mDeviceLost = true; |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 379 | |
| 380 | mCommandGraph.clear(); |
| 381 | mLastSubmittedQueueSerial = mCurrentQueueSerial; |
| 382 | mCurrentQueueSerial = mQueueSerialFactory.generate(); |
| 383 | freeAllInFlightResources(); |
| 384 | |
| 385 | mDisplay->notifyDeviceLost(); |
Geoff Lang | 2fe5e1d | 2018-08-28 14:00:24 -0400 | [diff] [blame] | 386 | } |
| 387 | |
| 388 | bool RendererVk::isDeviceLost() const |
| 389 | { |
| 390 | return mDeviceLost; |
| 391 | } |
| 392 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 393 | angle::Result RendererVk::initialize(DisplayVk *displayVk, |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 394 | egl::Display *display, |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 395 | const char *wsiName) |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 396 | { |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 397 | mDisplay = display; |
| 398 | const egl::AttributeMap &attribs = mDisplay->getAttributeMap(); |
Omar El Sheikh | 26c61b2 | 2018-06-29 12:50:59 -0600 | [diff] [blame] | 399 | ScopedVkLoaderEnvironment scopedEnvironment(ShouldUseDebugLayers(attribs), |
| 400 | ShouldEnableMockICD(attribs)); |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 401 | mEnableValidationLayers = scopedEnvironment.canEnableValidationLayers(); |
Jamie Madill | 0ea9621 | 2018-10-30 15:14:51 -0400 | [diff] [blame] | 402 | mEnableMockICD = scopedEnvironment.canEnableMockICD(); |
Jamie Madill | a66779f | 2017-01-06 10:43:44 -0500 | [diff] [blame] | 403 | |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 404 | // Gather global layer properties. |
| 405 | uint32_t instanceLayerCount = 0; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 406 | ANGLE_VK_TRY(displayVk, vkEnumerateInstanceLayerProperties(&instanceLayerCount, nullptr)); |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 407 | |
| 408 | std::vector<VkLayerProperties> instanceLayerProps(instanceLayerCount); |
| 409 | if (instanceLayerCount > 0) |
| 410 | { |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 411 | ANGLE_VK_TRY(displayVk, vkEnumerateInstanceLayerProperties(&instanceLayerCount, |
| 412 | instanceLayerProps.data())); |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 413 | } |
| 414 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 415 | uint32_t instanceExtensionCount = 0; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 416 | ANGLE_VK_TRY(displayVk, |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 417 | vkEnumerateInstanceExtensionProperties(nullptr, &instanceExtensionCount, nullptr)); |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 418 | |
| 419 | std::vector<VkExtensionProperties> instanceExtensionProps(instanceExtensionCount); |
| 420 | if (instanceExtensionCount > 0) |
| 421 | { |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 422 | ANGLE_VK_TRY(displayVk, |
| 423 | vkEnumerateInstanceExtensionProperties(nullptr, &instanceExtensionCount, |
| 424 | instanceExtensionProps.data())); |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 425 | } |
| 426 | |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 427 | const char *const *enabledLayerNames = nullptr; |
| 428 | uint32_t enabledLayerCount = 0; |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 429 | if (mEnableValidationLayers) |
| 430 | { |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 431 | bool layersRequested = |
| 432 | (attribs.get(EGL_PLATFORM_ANGLE_DEBUG_LAYERS_ENABLED_ANGLE, EGL_DONT_CARE) == EGL_TRUE); |
| 433 | mEnableValidationLayers = GetAvailableValidationLayers( |
| 434 | instanceLayerProps, layersRequested, &enabledLayerNames, &enabledLayerCount); |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 435 | } |
| 436 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 437 | std::vector<const char *> enabledInstanceExtensions; |
| 438 | enabledInstanceExtensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME); |
Frank Henigman | 29f148b | 2016-11-23 21:05:36 -0500 | [diff] [blame] | 439 | enabledInstanceExtensions.push_back(wsiName); |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 440 | |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 441 | // TODO(jmadill): Should be able to continue initialization if debug report ext missing. |
| 442 | if (mEnableValidationLayers) |
| 443 | { |
| 444 | enabledInstanceExtensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); |
| 445 | } |
| 446 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 447 | // Verify the required extensions are in the extension names set. Fail if not. |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 448 | ANGLE_VK_TRY(displayVk, |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 449 | VerifyExtensionsPresent(instanceExtensionProps, enabledInstanceExtensions)); |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 450 | |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 451 | VkApplicationInfo applicationInfo = {}; |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 452 | applicationInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 453 | applicationInfo.pApplicationName = "ANGLE"; |
| 454 | applicationInfo.applicationVersion = 1; |
| 455 | applicationInfo.pEngineName = "ANGLE"; |
| 456 | applicationInfo.engineVersion = 1; |
| 457 | applicationInfo.apiVersion = VK_API_VERSION_1_0; |
| 458 | |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 459 | VkInstanceCreateInfo instanceInfo = {}; |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 460 | instanceInfo.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 461 | instanceInfo.flags = 0; |
| 462 | instanceInfo.pApplicationInfo = &applicationInfo; |
| 463 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 464 | // Enable requested layers and extensions. |
| 465 | instanceInfo.enabledExtensionCount = static_cast<uint32_t>(enabledInstanceExtensions.size()); |
| 466 | instanceInfo.ppEnabledExtensionNames = |
| 467 | enabledInstanceExtensions.empty() ? nullptr : enabledInstanceExtensions.data(); |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 468 | instanceInfo.enabledLayerCount = enabledLayerCount; |
| 469 | instanceInfo.ppEnabledLayerNames = enabledLayerNames; |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 470 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 471 | ANGLE_VK_TRY(displayVk, vkCreateInstance(&instanceInfo, nullptr, &mInstance)); |
Jamie Madill | 327ba85 | 2016-11-30 12:38:28 -0500 | [diff] [blame] | 472 | |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 473 | if (mEnableValidationLayers) |
| 474 | { |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 475 | VkDebugReportCallbackCreateInfoEXT debugReportInfo = {}; |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 476 | |
| 477 | debugReportInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 478 | debugReportInfo.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT | |
| 479 | VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT | |
| 480 | VK_DEBUG_REPORT_INFORMATION_BIT_EXT | VK_DEBUG_REPORT_DEBUG_BIT_EXT; |
| 481 | debugReportInfo.pfnCallback = &DebugReportCallback; |
| 482 | debugReportInfo.pUserData = this; |
| 483 | |
| 484 | auto createDebugReportCallback = reinterpret_cast<PFN_vkCreateDebugReportCallbackEXT>( |
| 485 | vkGetInstanceProcAddr(mInstance, "vkCreateDebugReportCallbackEXT")); |
| 486 | ASSERT(createDebugReportCallback); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 487 | ANGLE_VK_TRY(displayVk, createDebugReportCallback(mInstance, &debugReportInfo, nullptr, |
| 488 | &mDebugReportCallback)); |
Jamie Madill | 0448ec8 | 2016-12-23 13:41:47 -0500 | [diff] [blame] | 489 | } |
| 490 | |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 491 | uint32_t physicalDeviceCount = 0; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 492 | ANGLE_VK_TRY(displayVk, vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount, nullptr)); |
| 493 | ANGLE_VK_CHECK(displayVk, physicalDeviceCount > 0, VK_ERROR_INITIALIZATION_FAILED); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 494 | |
| 495 | // TODO(jmadill): Handle multiple physical devices. For now, use the first device. |
Tobin Ehlis | a3b220f | 2018-03-06 16:22:13 -0700 | [diff] [blame] | 496 | std::vector<VkPhysicalDevice> physicalDevices(physicalDeviceCount); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 497 | ANGLE_VK_TRY(displayVk, vkEnumeratePhysicalDevices(mInstance, &physicalDeviceCount, |
| 498 | physicalDevices.data())); |
Jamie Madill | 0ea9621 | 2018-10-30 15:14:51 -0400 | [diff] [blame] | 499 | ChoosePhysicalDevice(physicalDevices, mEnableMockICD, &mPhysicalDevice, |
Tobin Ehlis | a3b220f | 2018-03-06 16:22:13 -0700 | [diff] [blame] | 500 | &mPhysicalDeviceProperties); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 501 | |
Jamie Madill | 30b5d84 | 2018-08-31 17:19:12 -0400 | [diff] [blame] | 502 | vkGetPhysicalDeviceFeatures(mPhysicalDevice, &mPhysicalDeviceFeatures); |
| 503 | |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 504 | // Ensure we can find a graphics queue family. |
| 505 | uint32_t queueCount = 0; |
| 506 | vkGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, nullptr); |
| 507 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 508 | ANGLE_VK_CHECK(displayVk, queueCount > 0, VK_ERROR_INITIALIZATION_FAILED); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 509 | |
| 510 | mQueueFamilyProperties.resize(queueCount); |
| 511 | vkGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, |
| 512 | mQueueFamilyProperties.data()); |
| 513 | |
| 514 | size_t graphicsQueueFamilyCount = false; |
| 515 | uint32_t firstGraphicsQueueFamily = 0; |
Shahbaz Youssefi | 823d897 | 2018-11-13 10:52:40 -0500 | [diff] [blame^] | 516 | constexpr VkQueueFlags kGraphicsAndCompute = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 517 | for (uint32_t familyIndex = 0; familyIndex < queueCount; ++familyIndex) |
| 518 | { |
| 519 | const auto &queueInfo = mQueueFamilyProperties[familyIndex]; |
Shahbaz Youssefi | 823d897 | 2018-11-13 10:52:40 -0500 | [diff] [blame^] | 520 | if ((queueInfo.queueFlags & kGraphicsAndCompute) == kGraphicsAndCompute) |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 521 | { |
| 522 | ASSERT(queueInfo.queueCount > 0); |
| 523 | graphicsQueueFamilyCount++; |
| 524 | if (firstGraphicsQueueFamily == 0) |
| 525 | { |
| 526 | firstGraphicsQueueFamily = familyIndex; |
| 527 | } |
| 528 | break; |
| 529 | } |
| 530 | } |
| 531 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 532 | ANGLE_VK_CHECK(displayVk, graphicsQueueFamilyCount > 0, VK_ERROR_INITIALIZATION_FAILED); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 533 | |
Jamie Madill | 1222207 | 2018-07-11 14:59:48 -0400 | [diff] [blame] | 534 | initFeatures(); |
| 535 | |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 536 | // If only one queue family, go ahead and initialize the device. If there is more than one |
| 537 | // queue, we'll have to wait until we see a WindowSurface to know which supports present. |
| 538 | if (graphicsQueueFamilyCount == 1) |
| 539 | { |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 540 | ANGLE_TRY(initializeDevice(displayVk, firstGraphicsQueueFamily)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 541 | } |
| 542 | |
Jamie Madill | 035fd6b | 2017-10-03 15:43:22 -0400 | [diff] [blame] | 543 | // Store the physical device memory properties so we can find the right memory pools. |
| 544 | mMemoryProperties.init(mPhysicalDevice); |
Jamie Madill | 7b57b9d | 2017-01-13 09:33:38 -0500 | [diff] [blame] | 545 | |
Jamie Madill | 06ca634 | 2018-07-12 15:56:53 -0400 | [diff] [blame] | 546 | GlslangWrapper::Initialize(); |
Jamie Madill | 8ecf7f9 | 2017-01-13 17:29:52 -0500 | [diff] [blame] | 547 | |
Jamie Madill | 6a89d22 | 2017-11-02 11:59:51 -0400 | [diff] [blame] | 548 | // Initialize the format table. |
Shahbaz Youssefi | 092481a | 2018-11-08 00:25:50 -0500 | [diff] [blame] | 549 | mFormatTable.initialize(mPhysicalDevice, mPhysicalDeviceProperties, mFeatures, |
| 550 | &mNativeTextureCaps, &mNativeCaps.compressedTextureFormats); |
Jamie Madill | 6a89d22 | 2017-11-02 11:59:51 -0400 | [diff] [blame] | 551 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 552 | return angle::Result::Continue(); |
Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 553 | } |
| 554 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 555 | angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueFamilyIndex) |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 556 | { |
| 557 | uint32_t deviceLayerCount = 0; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 558 | ANGLE_VK_TRY(displayVk, |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 559 | vkEnumerateDeviceLayerProperties(mPhysicalDevice, &deviceLayerCount, nullptr)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 560 | |
| 561 | std::vector<VkLayerProperties> deviceLayerProps(deviceLayerCount); |
| 562 | if (deviceLayerCount > 0) |
| 563 | { |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 564 | ANGLE_VK_TRY(displayVk, vkEnumerateDeviceLayerProperties(mPhysicalDevice, &deviceLayerCount, |
| 565 | deviceLayerProps.data())); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 566 | } |
| 567 | |
| 568 | uint32_t deviceExtensionCount = 0; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 569 | ANGLE_VK_TRY(displayVk, vkEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, |
| 570 | &deviceExtensionCount, nullptr)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 571 | |
| 572 | std::vector<VkExtensionProperties> deviceExtensionProps(deviceExtensionCount); |
| 573 | if (deviceExtensionCount > 0) |
| 574 | { |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 575 | ANGLE_VK_TRY(displayVk, vkEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, |
| 576 | &deviceExtensionCount, |
| 577 | deviceExtensionProps.data())); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 578 | } |
| 579 | |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 580 | const char *const *enabledLayerNames = nullptr; |
| 581 | uint32_t enabledLayerCount = 0; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 582 | if (mEnableValidationLayers) |
| 583 | { |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 584 | mEnableValidationLayers = GetAvailableValidationLayers( |
| 585 | deviceLayerProps, false, &enabledLayerNames, &enabledLayerCount); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 586 | } |
| 587 | |
| 588 | std::vector<const char *> enabledDeviceExtensions; |
| 589 | enabledDeviceExtensions.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME); |
| 590 | |
Luc Ferron | bf6dc37 | 2018-06-28 15:24:19 -0400 | [diff] [blame] | 591 | // Selectively enable KHR_MAINTENANCE1 to support viewport flipping. |
| 592 | if (getFeatures().flipViewportY) |
| 593 | { |
| 594 | enabledDeviceExtensions.push_back(VK_KHR_MAINTENANCE1_EXTENSION_NAME); |
| 595 | } |
| 596 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 597 | ANGLE_VK_TRY(displayVk, VerifyExtensionsPresent(deviceExtensionProps, enabledDeviceExtensions)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 598 | |
Shahbaz Youssefi | 563fbaa | 2018-10-02 11:22:01 -0400 | [diff] [blame] | 599 | // Select additional features to be enabled |
| 600 | VkPhysicalDeviceFeatures enabledFeatures = {}; |
| 601 | enabledFeatures.inheritedQueries = mPhysicalDeviceFeatures.inheritedQueries; |
| 602 | |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 603 | VkDeviceQueueCreateInfo queueCreateInfo = {}; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 604 | |
| 605 | float zeroPriority = 0.0f; |
| 606 | |
| 607 | queueCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 608 | queueCreateInfo.flags = 0; |
| 609 | queueCreateInfo.queueFamilyIndex = queueFamilyIndex; |
| 610 | queueCreateInfo.queueCount = 1; |
| 611 | queueCreateInfo.pQueuePriorities = &zeroPriority; |
| 612 | |
| 613 | // Initialize the device |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 614 | VkDeviceCreateInfo createInfo = {}; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 615 | |
Jamie Madill | 50cf2be | 2018-06-15 09:46:57 -0400 | [diff] [blame] | 616 | createInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; |
Jamie Madill | 50cf2be | 2018-06-15 09:46:57 -0400 | [diff] [blame] | 617 | createInfo.flags = 0; |
| 618 | createInfo.queueCreateInfoCount = 1; |
| 619 | createInfo.pQueueCreateInfos = &queueCreateInfo; |
Yuly Novikov | 199f429 | 2018-01-19 19:04:05 -0500 | [diff] [blame] | 620 | createInfo.enabledLayerCount = enabledLayerCount; |
| 621 | createInfo.ppEnabledLayerNames = enabledLayerNames; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 622 | createInfo.enabledExtensionCount = static_cast<uint32_t>(enabledDeviceExtensions.size()); |
| 623 | createInfo.ppEnabledExtensionNames = |
| 624 | enabledDeviceExtensions.empty() ? nullptr : enabledDeviceExtensions.data(); |
Shahbaz Youssefi | 563fbaa | 2018-10-02 11:22:01 -0400 | [diff] [blame] | 625 | createInfo.pEnabledFeatures = &enabledFeatures; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 626 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 627 | ANGLE_VK_TRY(displayVk, vkCreateDevice(mPhysicalDevice, &createInfo, nullptr, &mDevice)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 628 | |
| 629 | mCurrentQueueFamilyIndex = queueFamilyIndex; |
| 630 | |
| 631 | vkGetDeviceQueue(mDevice, mCurrentQueueFamilyIndex, 0, &mQueue); |
| 632 | |
| 633 | // Initialize the command pool now that we know the queue family index. |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 634 | VkCommandPoolCreateInfo commandPoolInfo = {}; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 635 | commandPoolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 636 | commandPoolInfo.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 637 | commandPoolInfo.queueFamilyIndex = mCurrentQueueFamilyIndex; |
| 638 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 639 | ANGLE_VK_TRY(displayVk, mCommandPool.init(mDevice, commandPoolInfo)); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 640 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 641 | // Initialize the vulkan pipeline cache. |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 642 | ANGLE_TRY(initPipelineCache(displayVk)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 643 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 644 | // Initialize the submission semaphore pool. |
| 645 | ANGLE_TRY(mSubmitSemaphorePool.init(displayVk, vk::kDefaultSemaphorePoolSize)); |
| 646 | |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 647 | #if ANGLE_ENABLE_VULKAN_GPU_TRACE_EVENTS |
| 648 | angle::PlatformMethods *platform = ANGLEPlatformCurrent(); |
| 649 | ASSERT(platform); |
| 650 | |
| 651 | // GPU tracing workaround for anglebug.com/2927. The renderer should not emit gpu events during |
| 652 | // platform discovery. |
| 653 | const unsigned char *gpuEventsEnabled = |
| 654 | platform->getTraceCategoryEnabledFlag(platform, "gpu.angle.gpu"); |
| 655 | mGpuEventsEnabled = gpuEventsEnabled && *gpuEventsEnabled; |
| 656 | #endif |
| 657 | |
| 658 | if (mGpuEventsEnabled) |
| 659 | { |
| 660 | // Calculate the difference between CPU and GPU clocks for GPU event reporting. |
| 661 | ANGLE_TRY(mGpuEventQueryPool.init(displayVk, VK_QUERY_TYPE_TIMESTAMP, |
| 662 | vk::kDefaultTimestampQueryPoolSize)); |
| 663 | ANGLE_TRY(synchronizeCpuGpuTime(displayVk)); |
| 664 | } |
| 665 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 666 | return angle::Result::Continue(); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 667 | } |
| 668 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 669 | angle::Result RendererVk::selectPresentQueueForSurface(DisplayVk *displayVk, |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 670 | VkSurfaceKHR surface, |
| 671 | uint32_t *presentQueueOut) |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 672 | { |
| 673 | // We've already initialized a device, and can't re-create it unless it's never been used. |
| 674 | // TODO(jmadill): Handle the re-creation case if necessary. |
| 675 | if (mDevice != VK_NULL_HANDLE) |
| 676 | { |
| 677 | ASSERT(mCurrentQueueFamilyIndex != std::numeric_limits<uint32_t>::max()); |
| 678 | |
| 679 | // Check if the current device supports present on this surface. |
| 680 | VkBool32 supportsPresent = VK_FALSE; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 681 | ANGLE_VK_TRY(displayVk, |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 682 | vkGetPhysicalDeviceSurfaceSupportKHR(mPhysicalDevice, mCurrentQueueFamilyIndex, |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 683 | surface, &supportsPresent)); |
| 684 | |
Jamie Madill | 6cad773 | 2018-07-11 09:01:17 -0400 | [diff] [blame] | 685 | if (supportsPresent == VK_TRUE) |
| 686 | { |
| 687 | *presentQueueOut = mCurrentQueueFamilyIndex; |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 688 | return angle::Result::Continue(); |
Jamie Madill | 6cad773 | 2018-07-11 09:01:17 -0400 | [diff] [blame] | 689 | } |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 690 | } |
| 691 | |
| 692 | // Find a graphics and present queue. |
| 693 | Optional<uint32_t> newPresentQueue; |
| 694 | uint32_t queueCount = static_cast<uint32_t>(mQueueFamilyProperties.size()); |
Shahbaz Youssefi | 823d897 | 2018-11-13 10:52:40 -0500 | [diff] [blame^] | 695 | constexpr VkQueueFlags kGraphicsAndCompute = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 696 | for (uint32_t queueIndex = 0; queueIndex < queueCount; ++queueIndex) |
| 697 | { |
| 698 | const auto &queueInfo = mQueueFamilyProperties[queueIndex]; |
Shahbaz Youssefi | 823d897 | 2018-11-13 10:52:40 -0500 | [diff] [blame^] | 699 | if ((queueInfo.queueFlags & kGraphicsAndCompute) == kGraphicsAndCompute) |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 700 | { |
| 701 | VkBool32 supportsPresent = VK_FALSE; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 702 | ANGLE_VK_TRY(displayVk, vkGetPhysicalDeviceSurfaceSupportKHR( |
| 703 | mPhysicalDevice, queueIndex, surface, &supportsPresent)); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 704 | |
| 705 | if (supportsPresent == VK_TRUE) |
| 706 | { |
| 707 | newPresentQueue = queueIndex; |
| 708 | break; |
| 709 | } |
| 710 | } |
| 711 | } |
| 712 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 713 | ANGLE_VK_CHECK(displayVk, newPresentQueue.valid(), VK_ERROR_INITIALIZATION_FAILED); |
| 714 | ANGLE_TRY(initializeDevice(displayVk, newPresentQueue.value())); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 715 | |
Jamie Madill | 6cad773 | 2018-07-11 09:01:17 -0400 | [diff] [blame] | 716 | *presentQueueOut = newPresentQueue.value(); |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 717 | return angle::Result::Continue(); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 718 | } |
| 719 | |
| 720 | std::string RendererVk::getVendorString() const |
| 721 | { |
Olli Etuaho | c6a0618 | 2018-04-13 14:11:46 +0300 | [diff] [blame] | 722 | return GetVendorString(mPhysicalDeviceProperties.vendorID); |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 723 | } |
| 724 | |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 725 | std::string RendererVk::getRendererDescription() const |
| 726 | { |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 727 | std::stringstream strstr; |
| 728 | |
| 729 | uint32_t apiVersion = mPhysicalDeviceProperties.apiVersion; |
| 730 | |
| 731 | strstr << "Vulkan "; |
| 732 | strstr << VK_VERSION_MAJOR(apiVersion) << "."; |
| 733 | strstr << VK_VERSION_MINOR(apiVersion) << "."; |
| 734 | strstr << VK_VERSION_PATCH(apiVersion); |
| 735 | |
Olli Etuaho | c6a0618 | 2018-04-13 14:11:46 +0300 | [diff] [blame] | 736 | strstr << "("; |
| 737 | |
| 738 | // In the case of NVIDIA, deviceName does not necessarily contain "NVIDIA". Add "NVIDIA" so that |
| 739 | // Vulkan end2end tests can be selectively disabled on NVIDIA. TODO(jmadill): should not be |
| 740 | // needed after http://anglebug.com/1874 is fixed and end2end_tests use more sophisticated |
| 741 | // driver detection. |
| 742 | if (mPhysicalDeviceProperties.vendorID == VENDOR_ID_NVIDIA) |
| 743 | { |
| 744 | strstr << GetVendorString(mPhysicalDeviceProperties.vendorID) << " "; |
| 745 | } |
| 746 | |
| 747 | strstr << mPhysicalDeviceProperties.deviceName << ")"; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 748 | |
| 749 | return strstr.str(); |
Jamie Madill | e09bd5d | 2016-11-29 16:20:35 -0500 | [diff] [blame] | 750 | } |
| 751 | |
Shahbaz Youssefi | 092481a | 2018-11-08 00:25:50 -0500 | [diff] [blame] | 752 | gl::Version RendererVk::getMaxSupportedESVersion() const |
| 753 | { |
| 754 | // Declare GLES2 support if necessary features for GLES3 are missing |
| 755 | bool necessaryFeaturesForES3 = mPhysicalDeviceFeatures.inheritedQueries; |
| 756 | |
| 757 | if (!necessaryFeaturesForES3) |
| 758 | { |
| 759 | return gl::Version(2, 0); |
| 760 | } |
| 761 | |
| 762 | return gl::Version(3, 0); |
| 763 | } |
| 764 | |
Jamie Madill | 1222207 | 2018-07-11 14:59:48 -0400 | [diff] [blame] | 765 | void RendererVk::initFeatures() |
| 766 | { |
Jamie Madill | b36a481 | 2018-09-25 10:15:11 -0400 | [diff] [blame] | 767 | // Use OpenGL line rasterization rules by default. |
| 768 | // TODO(jmadill): Fix Android support. http://anglebug.com/2830 |
| 769 | #if defined(ANGLE_PLATFORM_ANDROID) |
| 770 | mFeatures.basicGLLineRasterization = false; |
| 771 | #else |
Jamie Madill | 1222207 | 2018-07-11 14:59:48 -0400 | [diff] [blame] | 772 | mFeatures.basicGLLineRasterization = true; |
Jamie Madill | b36a481 | 2018-09-25 10:15:11 -0400 | [diff] [blame] | 773 | #endif // defined(ANGLE_PLATFORM_ANDROID) |
Jamie Madill | 1222207 | 2018-07-11 14:59:48 -0400 | [diff] [blame] | 774 | |
Luc Ferron | f786b70 | 2018-07-10 11:01:43 -0400 | [diff] [blame] | 775 | // TODO(lucferron): Currently disabled on Intel only since many tests are failing and need |
| 776 | // investigation. http://anglebug.com/2728 |
| 777 | mFeatures.flipViewportY = !IsIntel(mPhysicalDeviceProperties.vendorID); |
Frank Henigman | beb669d | 2018-09-21 16:25:52 -0400 | [diff] [blame] | 778 | |
| 779 | #ifdef ANGLE_PLATFORM_WINDOWS |
| 780 | // http://anglebug.com/2838 |
| 781 | mFeatures.extraCopyBufferRegion = IsIntel(mPhysicalDeviceProperties.vendorID); |
| 782 | #endif |
Shahbaz Youssefi | d856ca4 | 2018-10-31 16:55:12 -0400 | [diff] [blame] | 783 | |
| 784 | angle::PlatformMethods *platform = ANGLEPlatformCurrent(); |
| 785 | platform->overrideFeaturesVk(platform, &mFeatures); |
Jamie Madill | fde74c0 | 2018-11-18 16:12:02 -0500 | [diff] [blame] | 786 | |
| 787 | // Work around incorrect NVIDIA point size range clamping. |
| 788 | // TODO(jmadill): Narrow driver range once fixed. http://anglebug.com/2970 |
| 789 | if (IsNvidia(mPhysicalDeviceProperties.vendorID)) |
| 790 | { |
| 791 | mFeatures.clampPointSize = true; |
| 792 | } |
Jamie Madill | 1222207 | 2018-07-11 14:59:48 -0400 | [diff] [blame] | 793 | } |
| 794 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 795 | void RendererVk::initPipelineCacheVkKey() |
| 796 | { |
| 797 | std::ostringstream hashStream("ANGLE Pipeline Cache: ", std::ios_base::ate); |
| 798 | // Add the pipeline cache UUID to make sure the blob cache always gives a compatible pipeline |
| 799 | // cache. It's not particularly necessary to write it as a hex number as done here, so long as |
| 800 | // there is no '\0' in the result. |
| 801 | for (const uint32_t c : mPhysicalDeviceProperties.pipelineCacheUUID) |
| 802 | { |
| 803 | hashStream << std::hex << c; |
| 804 | } |
| 805 | // Add the vendor and device id too for good measure. |
| 806 | hashStream << std::hex << mPhysicalDeviceProperties.vendorID; |
| 807 | hashStream << std::hex << mPhysicalDeviceProperties.deviceID; |
| 808 | |
| 809 | const std::string &hashString = hashStream.str(); |
| 810 | angle::base::SHA1HashBytes(reinterpret_cast<const unsigned char *>(hashString.c_str()), |
| 811 | hashString.length(), mPipelineCacheVkBlobKey.data()); |
| 812 | } |
| 813 | |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 814 | angle::Result RendererVk::initPipelineCache(DisplayVk *display) |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 815 | { |
| 816 | initPipelineCacheVkKey(); |
| 817 | |
| 818 | egl::BlobCache::Value initialData; |
| 819 | bool success = display->getBlobCache()->get(display->getScratchBuffer(), |
| 820 | mPipelineCacheVkBlobKey, &initialData); |
| 821 | |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 822 | VkPipelineCacheCreateInfo pipelineCacheCreateInfo = {}; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 823 | |
| 824 | pipelineCacheCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 825 | pipelineCacheCreateInfo.flags = 0; |
| 826 | pipelineCacheCreateInfo.initialDataSize = success ? initialData.size() : 0; |
| 827 | pipelineCacheCreateInfo.pInitialData = success ? initialData.data() : nullptr; |
| 828 | |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 829 | ANGLE_VK_TRY(display, mPipelineCache.init(mDevice, pipelineCacheCreateInfo)); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 830 | return angle::Result::Continue(); |
| 831 | } |
| 832 | |
Jamie Madill | acccc6c | 2016-05-03 17:22:10 -0400 | [diff] [blame] | 833 | void RendererVk::ensureCapsInitialized() const |
| 834 | { |
| 835 | if (!mCapsInitialized) |
| 836 | { |
Shahbaz Youssefi | c2b576d | 2018-10-12 14:45:34 -0400 | [diff] [blame] | 837 | ASSERT(mCurrentQueueFamilyIndex < mQueueFamilyProperties.size()); |
| 838 | vk::GenerateCaps(mPhysicalDeviceProperties, mPhysicalDeviceFeatures, |
| 839 | mQueueFamilyProperties[mCurrentQueueFamilyIndex], mNativeTextureCaps, |
Jamie Madill | 30b5d84 | 2018-08-31 17:19:12 -0400 | [diff] [blame] | 840 | &mNativeCaps, &mNativeExtensions, &mNativeLimitations); |
Jamie Madill | acccc6c | 2016-05-03 17:22:10 -0400 | [diff] [blame] | 841 | mCapsInitialized = true; |
| 842 | } |
| 843 | } |
| 844 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 845 | void RendererVk::getSubmitWaitSemaphores( |
| 846 | vk::Context *context, |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 847 | angle::FixedVector<VkSemaphore, kMaxWaitSemaphores> *waitSemaphores, |
| 848 | angle::FixedVector<VkPipelineStageFlags, kMaxWaitSemaphores> *waitStageMasks) |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 849 | { |
| 850 | if (mSubmitLastSignaledSemaphore.getSemaphore()) |
| 851 | { |
| 852 | waitSemaphores->push_back(mSubmitLastSignaledSemaphore.getSemaphore()->getHandle()); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 853 | waitStageMasks->push_back(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT); |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 854 | |
| 855 | // Return the semaphore to the pool (which will remain valid and unused until the |
| 856 | // queue it's about to be waited on has finished execution). |
| 857 | mSubmitSemaphorePool.freeSemaphore(context, &mSubmitLastSignaledSemaphore); |
| 858 | } |
| 859 | |
| 860 | for (vk::SemaphoreHelper &semaphore : mSubmitWaitSemaphores) |
| 861 | { |
| 862 | waitSemaphores->push_back(semaphore.getSemaphore()->getHandle()); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 863 | waitStageMasks->push_back(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT); |
| 864 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 865 | mSubmitSemaphorePool.freeSemaphore(context, &semaphore); |
| 866 | } |
| 867 | mSubmitWaitSemaphores.clear(); |
| 868 | } |
| 869 | |
Jamie Madill | acccc6c | 2016-05-03 17:22:10 -0400 | [diff] [blame] | 870 | const gl::Caps &RendererVk::getNativeCaps() const |
| 871 | { |
| 872 | ensureCapsInitialized(); |
| 873 | return mNativeCaps; |
| 874 | } |
| 875 | |
| 876 | const gl::TextureCapsMap &RendererVk::getNativeTextureCaps() const |
| 877 | { |
| 878 | ensureCapsInitialized(); |
| 879 | return mNativeTextureCaps; |
| 880 | } |
| 881 | |
| 882 | const gl::Extensions &RendererVk::getNativeExtensions() const |
| 883 | { |
| 884 | ensureCapsInitialized(); |
| 885 | return mNativeExtensions; |
| 886 | } |
| 887 | |
| 888 | const gl::Limitations &RendererVk::getNativeLimitations() const |
| 889 | { |
| 890 | ensureCapsInitialized(); |
| 891 | return mNativeLimitations; |
| 892 | } |
| 893 | |
Luc Ferron | daedf4d | 2018-03-16 09:28:53 -0400 | [diff] [blame] | 894 | uint32_t RendererVk::getMaxActiveTextures() |
| 895 | { |
| 896 | // TODO(lucferron): expose this limitation to GL in Context Caps |
| 897 | return std::min<uint32_t>(mPhysicalDeviceProperties.limits.maxPerStageDescriptorSamplers, |
| 898 | gl::IMPLEMENTATION_MAX_ACTIVE_TEXTURES); |
| 899 | } |
| 900 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 901 | const vk::CommandPool &RendererVk::getCommandPool() const |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 902 | { |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 903 | return mCommandPool; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 904 | } |
| 905 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 906 | angle::Result RendererVk::finish(vk::Context *context) |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 907 | { |
Jamie Madill | 1f46bc1 | 2018-02-20 16:09:43 -0500 | [diff] [blame] | 908 | if (!mCommandGraph.empty()) |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 909 | { |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 910 | TRACE_EVENT0("gpu.angle", "RendererVk::finish"); |
| 911 | |
Luc Ferron | 1617e69 | 2018-07-11 11:08:19 -0400 | [diff] [blame] | 912 | vk::Scoped<vk::CommandBuffer> commandBatch(mDevice); |
| 913 | ANGLE_TRY(flushCommandGraph(context, &commandBatch.get())); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 914 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 915 | angle::FixedVector<VkSemaphore, kMaxWaitSemaphores> waitSemaphores; |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 916 | angle::FixedVector<VkPipelineStageFlags, kMaxWaitSemaphores> waitStageMasks; |
| 917 | getSubmitWaitSemaphores(context, &waitSemaphores, &waitStageMasks); |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 918 | |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 919 | VkSubmitInfo submitInfo = {}; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 920 | submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 921 | submitInfo.waitSemaphoreCount = static_cast<uint32_t>(waitSemaphores.size()); |
| 922 | submitInfo.pWaitSemaphores = waitSemaphores.data(); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 923 | submitInfo.pWaitDstStageMask = waitStageMasks.data(); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 924 | submitInfo.commandBufferCount = 1; |
Luc Ferron | 1617e69 | 2018-07-11 11:08:19 -0400 | [diff] [blame] | 925 | submitInfo.pCommandBuffers = commandBatch.get().ptr(); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 926 | submitInfo.signalSemaphoreCount = 0; |
| 927 | submitInfo.pSignalSemaphores = nullptr; |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 928 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 929 | ANGLE_TRY(submitFrame(context, submitInfo, std::move(commandBatch.get()))); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 930 | } |
Jamie Madill | 4d0bf55 | 2016-12-28 15:45:24 -0500 | [diff] [blame] | 931 | |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 932 | ASSERT(mQueue != VK_NULL_HANDLE); |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 933 | ANGLE_VK_TRY(context, vkQueueWaitIdle(mQueue)); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 934 | freeAllInFlightResources(); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 935 | |
| 936 | if (mGpuEventsEnabled) |
| 937 | { |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 938 | // This loop should in practice execute once since the queue is already idle. |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 939 | while (mInFlightGpuEventQueries.size() > 0) |
| 940 | { |
| 941 | ANGLE_TRY(checkCompletedGpuEvents(context)); |
| 942 | } |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 943 | // Recalculate the CPU/GPU time difference to account for clock drifting. Avoid unnecessary |
| 944 | // synchronization if there is no event to be adjusted (happens when finish() gets called |
| 945 | // multiple times towards the end of the application). |
| 946 | if (mGpuEvents.size() > 0) |
| 947 | { |
| 948 | ANGLE_TRY(synchronizeCpuGpuTime(context)); |
| 949 | } |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 950 | } |
| 951 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 952 | return angle::Result::Continue(); |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 953 | } |
| 954 | |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 955 | void RendererVk::freeAllInFlightResources() |
| 956 | { |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 957 | for (CommandBatch &batch : mInFlightCommands) |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 958 | { |
Yuly Novikov | b56ddbb | 2018-11-02 16:53:18 -0400 | [diff] [blame] | 959 | // On device loss we need to wait for fence to be signaled before destroying it |
| 960 | if (mDeviceLost) |
| 961 | { |
| 962 | VkResult status = batch.fence.wait(mDevice, kMaxFenceWaitTimeNs); |
| 963 | // If wait times out, it is probably not possible to recover from lost device |
| 964 | ASSERT(status == VK_SUCCESS || status == VK_ERROR_DEVICE_LOST); |
| 965 | } |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 966 | batch.fence.destroy(mDevice); |
| 967 | batch.commandPool.destroy(mDevice); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 968 | } |
| 969 | mInFlightCommands.clear(); |
| 970 | |
| 971 | for (auto &garbage : mGarbage) |
| 972 | { |
Jamie Madill | e88ec8e | 2017-10-31 17:18:14 -0400 | [diff] [blame] | 973 | garbage.destroy(mDevice); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 974 | } |
| 975 | mGarbage.clear(); |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 976 | |
| 977 | mLastCompletedQueueSerial = mLastSubmittedQueueSerial; |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 978 | } |
| 979 | |
Shahbaz Youssefi | c4765aa | 2018-10-12 14:40:29 -0400 | [diff] [blame] | 980 | angle::Result RendererVk::checkCompletedCommands(vk::Context *context) |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 981 | { |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 982 | int finishedCount = 0; |
Jamie Madill | f651c77 | 2017-02-21 15:03:51 -0500 | [diff] [blame] | 983 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 984 | for (CommandBatch &batch : mInFlightCommands) |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 985 | { |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 986 | VkResult result = batch.fence.getStatus(mDevice); |
| 987 | if (result == VK_NOT_READY) |
| 988 | { |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 989 | break; |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 990 | } |
| 991 | ANGLE_VK_TRY(context, result); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 992 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 993 | ASSERT(batch.serial > mLastCompletedQueueSerial); |
| 994 | mLastCompletedQueueSerial = batch.serial; |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 995 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 996 | batch.fence.destroy(mDevice); |
| 997 | batch.commandPool.destroy(mDevice); |
| 998 | ++finishedCount; |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 999 | } |
| 1000 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1001 | mInFlightCommands.erase(mInFlightCommands.begin(), mInFlightCommands.begin() + finishedCount); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 1002 | |
| 1003 | size_t freeIndex = 0; |
| 1004 | for (; freeIndex < mGarbage.size(); ++freeIndex) |
| 1005 | { |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1006 | if (!mGarbage[freeIndex].destroyIfComplete(mDevice, mLastCompletedQueueSerial)) |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 1007 | break; |
| 1008 | } |
| 1009 | |
| 1010 | // Remove the entries from the garbage list - they should be ready to go. |
| 1011 | if (freeIndex > 0) |
| 1012 | { |
| 1013 | mGarbage.erase(mGarbage.begin(), mGarbage.begin() + freeIndex); |
Jamie Madill | f651c77 | 2017-02-21 15:03:51 -0500 | [diff] [blame] | 1014 | } |
| 1015 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1016 | return angle::Result::Continue(); |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 1017 | } |
| 1018 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1019 | angle::Result RendererVk::submitFrame(vk::Context *context, |
| 1020 | const VkSubmitInfo &submitInfo, |
| 1021 | vk::CommandBuffer &&commandBuffer) |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 1022 | { |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 1023 | VkFenceCreateInfo fenceInfo = {}; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1024 | fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1025 | fenceInfo.flags = 0; |
| 1026 | |
Jamie Madill | bea35a6 | 2018-07-05 11:54:10 -0400 | [diff] [blame] | 1027 | vk::Scoped<CommandBatch> scopedBatch(mDevice); |
| 1028 | CommandBatch &batch = scopedBatch.get(); |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1029 | ANGLE_VK_TRY(context, batch.fence.init(mDevice, fenceInfo)); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1030 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1031 | ANGLE_VK_TRY(context, vkQueueSubmit(mQueue, 1, &submitInfo, batch.fence.getHandle())); |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 1032 | |
| 1033 | // Store this command buffer in the in-flight list. |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1034 | batch.commandPool = std::move(mCommandPool); |
| 1035 | batch.serial = mCurrentQueueSerial; |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 1036 | |
Jamie Madill | bea35a6 | 2018-07-05 11:54:10 -0400 | [diff] [blame] | 1037 | mInFlightCommands.emplace_back(scopedBatch.release()); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 1038 | |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 1039 | // CPU should be throttled to avoid mInFlightCommands from growing too fast. That is done on |
| 1040 | // swap() though, and there could be multiple submissions in between (through glFlush() calls), |
| 1041 | // so the limit is larger than the expected number of images. |
| 1042 | ASSERT(mInFlightCommands.size() <= kInFlightCommandsLimit); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 1043 | |
| 1044 | // Increment the queue serial. If this fails, we should restart ANGLE. |
Jamie Madill | fb05bcb | 2017-06-07 15:43:18 -0400 | [diff] [blame] | 1045 | // TODO(jmadill): Overflow check. |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 1046 | mLastSubmittedQueueSerial = mCurrentQueueSerial; |
Jamie Madill | fb05bcb | 2017-06-07 15:43:18 -0400 | [diff] [blame] | 1047 | mCurrentQueueSerial = mQueueSerialFactory.generate(); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 1048 | |
Shahbaz Youssefi | c4765aa | 2018-10-12 14:40:29 -0400 | [diff] [blame] | 1049 | ANGLE_TRY(checkCompletedCommands(context)); |
Jamie Madill | 0c0dc34 | 2017-03-24 14:18:51 -0400 | [diff] [blame] | 1050 | |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1051 | if (mGpuEventsEnabled) |
| 1052 | { |
| 1053 | ANGLE_TRY(checkCompletedGpuEvents(context)); |
| 1054 | } |
| 1055 | |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1056 | // Simply null out the command buffer here - it was allocated using the command pool. |
| 1057 | commandBuffer.releaseHandle(); |
| 1058 | |
| 1059 | // Reallocate the command pool for next frame. |
| 1060 | // TODO(jmadill): Consider reusing command pools. |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 1061 | VkCommandPoolCreateInfo poolInfo = {}; |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1062 | poolInfo.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1063 | poolInfo.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1064 | poolInfo.queueFamilyIndex = mCurrentQueueFamilyIndex; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1065 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1066 | ANGLE_VK_TRY(context, mCommandPool.init(mDevice, poolInfo)); |
| 1067 | return angle::Result::Continue(); |
Jamie Madill | 4c26fc2 | 2017-02-24 11:04:10 -0500 | [diff] [blame] | 1068 | } |
| 1069 | |
Jamie Madill | aaca96e | 2018-06-12 10:19:48 -0400 | [diff] [blame] | 1070 | bool RendererVk::isSerialInUse(Serial serial) const |
Jamie Madill | 9776035 | 2017-11-09 13:08:29 -0500 | [diff] [blame] | 1071 | { |
| 1072 | return serial > mLastCompletedQueueSerial; |
| 1073 | } |
| 1074 | |
Shahbaz Youssefi | c4765aa | 2018-10-12 14:40:29 -0400 | [diff] [blame] | 1075 | angle::Result RendererVk::finishToSerial(vk::Context *context, Serial serial) |
| 1076 | { |
| 1077 | if (!isSerialInUse(serial) || mInFlightCommands.empty()) |
| 1078 | { |
| 1079 | return angle::Result::Continue(); |
| 1080 | } |
| 1081 | |
| 1082 | // Find the first batch with serial equal to or bigger than given serial (note that |
| 1083 | // the batch serials are unique, otherwise upper-bound would have been necessary). |
| 1084 | size_t batchIndex = mInFlightCommands.size() - 1; |
| 1085 | for (size_t i = 0; i < mInFlightCommands.size(); ++i) |
| 1086 | { |
| 1087 | if (mInFlightCommands[i].serial >= serial) |
| 1088 | { |
| 1089 | batchIndex = i; |
| 1090 | break; |
| 1091 | } |
| 1092 | } |
| 1093 | const CommandBatch &batch = mInFlightCommands[batchIndex]; |
| 1094 | |
| 1095 | // Wait for it finish |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1096 | ANGLE_VK_TRY(context, batch.fence.wait(mDevice, kMaxFenceWaitTimeNs)); |
Shahbaz Youssefi | c4765aa | 2018-10-12 14:40:29 -0400 | [diff] [blame] | 1097 | |
| 1098 | // Clean up finished batches. |
| 1099 | return checkCompletedCommands(context); |
| 1100 | } |
| 1101 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1102 | angle::Result RendererVk::getCompatibleRenderPass(vk::Context *context, |
| 1103 | const vk::RenderPassDesc &desc, |
| 1104 | vk::RenderPass **renderPassOut) |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 1105 | { |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1106 | return mRenderPassCache.getCompatibleRenderPass(context, mCurrentQueueSerial, desc, |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 1107 | renderPassOut); |
| 1108 | } |
| 1109 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1110 | angle::Result RendererVk::getRenderPassWithOps(vk::Context *context, |
| 1111 | const vk::RenderPassDesc &desc, |
| 1112 | const vk::AttachmentOpsArray &ops, |
| 1113 | vk::RenderPass **renderPassOut) |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 1114 | { |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1115 | return mRenderPassCache.getRenderPassWithOps(context, mCurrentQueueSerial, desc, ops, |
Jamie Madill | bef918c | 2017-12-13 13:11:30 -0500 | [diff] [blame] | 1116 | renderPassOut); |
Jamie Madill | 9f2a861 | 2017-11-30 12:43:09 -0500 | [diff] [blame] | 1117 | } |
| 1118 | |
Jamie Madill | a5e0607 | 2018-05-18 14:36:05 -0400 | [diff] [blame] | 1119 | vk::CommandGraph *RendererVk::getCommandGraph() |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1120 | { |
Jamie Madill | a5e0607 | 2018-05-18 14:36:05 -0400 | [diff] [blame] | 1121 | return &mCommandGraph; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1122 | } |
| 1123 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1124 | angle::Result RendererVk::flushCommandGraph(vk::Context *context, vk::CommandBuffer *commandBatch) |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1125 | { |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1126 | return mCommandGraph.submitCommands(context, mCurrentQueueSerial, &mRenderPassCache, |
Jamie Madill | 1f46bc1 | 2018-02-20 16:09:43 -0500 | [diff] [blame] | 1127 | &mCommandPool, commandBatch); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1128 | } |
| 1129 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1130 | angle::Result RendererVk::flush(vk::Context *context) |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1131 | { |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1132 | if (mCommandGraph.empty()) |
| 1133 | { |
| 1134 | return angle::Result::Continue(); |
| 1135 | } |
| 1136 | |
Shahbaz Youssefi | 6165602 | 2018-10-24 15:00:50 -0400 | [diff] [blame] | 1137 | TRACE_EVENT0("gpu.angle", "RendererVk::flush"); |
| 1138 | |
Jamie Madill | bea35a6 | 2018-07-05 11:54:10 -0400 | [diff] [blame] | 1139 | vk::Scoped<vk::CommandBuffer> commandBatch(mDevice); |
| 1140 | ANGLE_TRY(flushCommandGraph(context, &commandBatch.get())); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1141 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1142 | angle::FixedVector<VkSemaphore, kMaxWaitSemaphores> waitSemaphores; |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1143 | angle::FixedVector<VkPipelineStageFlags, kMaxWaitSemaphores> waitStageMasks; |
| 1144 | getSubmitWaitSemaphores(context, &waitSemaphores, &waitStageMasks); |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1145 | |
| 1146 | // On every flush, create a semaphore to be signaled. On the next submission, this semaphore |
| 1147 | // will be waited on. |
| 1148 | ANGLE_TRY(mSubmitSemaphorePool.allocateSemaphore(context, &mSubmitLastSignaledSemaphore)); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1149 | |
Shahbaz Youssefi | 06270c9 | 2018-10-03 17:00:25 -0400 | [diff] [blame] | 1150 | VkSubmitInfo submitInfo = {}; |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1151 | submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1152 | submitInfo.waitSemaphoreCount = static_cast<uint32_t>(waitSemaphores.size()); |
| 1153 | submitInfo.pWaitSemaphores = waitSemaphores.data(); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1154 | submitInfo.pWaitDstStageMask = waitStageMasks.data(); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1155 | submitInfo.commandBufferCount = 1; |
Jamie Madill | bea35a6 | 2018-07-05 11:54:10 -0400 | [diff] [blame] | 1156 | submitInfo.pCommandBuffers = commandBatch.get().ptr(); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1157 | submitInfo.signalSemaphoreCount = 1; |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1158 | submitInfo.pSignalSemaphores = mSubmitLastSignaledSemaphore.getSemaphore()->ptr(); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1159 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1160 | ANGLE_TRY(submitFrame(context, submitInfo, commandBatch.release())); |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1161 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1162 | return angle::Result::Continue(); |
Jamie Madill | 49ac74b | 2017-12-21 14:42:33 -0500 | [diff] [blame] | 1163 | } |
| 1164 | |
Jamie Madill | 78feddc | 2018-04-27 11:45:05 -0400 | [diff] [blame] | 1165 | Serial RendererVk::issueShaderSerial() |
Jamie Madill | f2f6d37 | 2018-01-10 21:37:23 -0500 | [diff] [blame] | 1166 | { |
Jamie Madill | 78feddc | 2018-04-27 11:45:05 -0400 | [diff] [blame] | 1167 | return mShaderSerialFactory.generate(); |
Jamie Madill | f2f6d37 | 2018-01-10 21:37:23 -0500 | [diff] [blame] | 1168 | } |
| 1169 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1170 | angle::Result RendererVk::getDescriptorSetLayout( |
| 1171 | vk::Context *context, |
Jamie Madill | 9b168d0 | 2018-06-13 13:25:32 -0400 | [diff] [blame] | 1172 | const vk::DescriptorSetLayoutDesc &desc, |
| 1173 | vk::BindingPointer<vk::DescriptorSetLayout> *descriptorSetLayoutOut) |
| 1174 | { |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1175 | return mDescriptorSetLayoutCache.getDescriptorSetLayout(context, desc, descriptorSetLayoutOut); |
Jamie Madill | 9b168d0 | 2018-06-13 13:25:32 -0400 | [diff] [blame] | 1176 | } |
| 1177 | |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1178 | angle::Result RendererVk::getPipelineLayout( |
| 1179 | vk::Context *context, |
Jamie Madill | 9b168d0 | 2018-06-13 13:25:32 -0400 | [diff] [blame] | 1180 | const vk::PipelineLayoutDesc &desc, |
| 1181 | const vk::DescriptorSetLayoutPointerArray &descriptorSetLayouts, |
| 1182 | vk::BindingPointer<vk::PipelineLayout> *pipelineLayoutOut) |
| 1183 | { |
Jamie Madill | 2106102 | 2018-07-12 23:56:30 -0400 | [diff] [blame] | 1184 | return mPipelineLayoutCache.getPipelineLayout(context, desc, descriptorSetLayouts, |
Jamie Madill | 9b168d0 | 2018-06-13 13:25:32 -0400 | [diff] [blame] | 1185 | pipelineLayoutOut); |
| 1186 | } |
| 1187 | |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 1188 | angle::Result RendererVk::syncPipelineCacheVk(DisplayVk *displayVk) |
| 1189 | { |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 1190 | ASSERT(mPipelineCache.valid()); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 1191 | |
| 1192 | if (--mPipelineCacheVkUpdateTimeout > 0) |
| 1193 | { |
| 1194 | return angle::Result::Continue(); |
| 1195 | } |
| 1196 | |
| 1197 | mPipelineCacheVkUpdateTimeout = kPipelineCacheVkUpdatePeriod; |
| 1198 | |
| 1199 | // Get the size of the cache. |
| 1200 | size_t pipelineCacheSize = 0; |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 1201 | VkResult result = mPipelineCache.getCacheData(mDevice, &pipelineCacheSize, nullptr); |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1202 | if (result != VK_INCOMPLETE) |
| 1203 | { |
| 1204 | ANGLE_VK_TRY(displayVk, result); |
| 1205 | } |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 1206 | |
| 1207 | angle::MemoryBuffer *pipelineCacheData = nullptr; |
| 1208 | ANGLE_VK_CHECK_ALLOC(displayVk, |
| 1209 | displayVk->getScratchBuffer(pipelineCacheSize, &pipelineCacheData)); |
| 1210 | |
| 1211 | size_t originalPipelineCacheSize = pipelineCacheSize; |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 1212 | result = mPipelineCache.getCacheData(mDevice, &pipelineCacheSize, pipelineCacheData->data()); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 1213 | // Note: currently we don't accept incomplete as we don't expect it (the full size of cache |
| 1214 | // was determined just above), so receiving it hints at an implementation bug we would want |
| 1215 | // to know about early. |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1216 | ASSERT(result != VK_INCOMPLETE); |
| 1217 | ANGLE_VK_TRY(displayVk, result); |
Shahbaz Youssefi | 996628a | 2018-09-24 16:39:26 -0400 | [diff] [blame] | 1218 | |
| 1219 | // If vkGetPipelineCacheData ends up writing fewer bytes than requested, zero out the rest of |
| 1220 | // the buffer to avoid leaking garbage memory. |
| 1221 | ASSERT(pipelineCacheSize <= originalPipelineCacheSize); |
| 1222 | if (pipelineCacheSize < originalPipelineCacheSize) |
| 1223 | { |
| 1224 | memset(pipelineCacheData->data() + pipelineCacheSize, 0, |
| 1225 | originalPipelineCacheSize - pipelineCacheSize); |
| 1226 | } |
| 1227 | |
| 1228 | displayVk->getBlobCache()->putApplication(mPipelineCacheVkBlobKey, *pipelineCacheData); |
| 1229 | |
| 1230 | return angle::Result::Continue(); |
| 1231 | } |
| 1232 | |
Shahbaz Youssefi | 3a48217 | 2018-10-11 10:34:44 -0400 | [diff] [blame] | 1233 | angle::Result RendererVk::allocateSubmitWaitSemaphore(vk::Context *context, |
| 1234 | const vk::Semaphore **outSemaphore) |
| 1235 | { |
| 1236 | ASSERT(mSubmitWaitSemaphores.size() < mSubmitWaitSemaphores.max_size()); |
| 1237 | |
| 1238 | vk::SemaphoreHelper semaphore; |
| 1239 | ANGLE_TRY(mSubmitSemaphorePool.allocateSemaphore(context, &semaphore)); |
| 1240 | |
| 1241 | mSubmitWaitSemaphores.push_back(std::move(semaphore)); |
| 1242 | *outSemaphore = mSubmitWaitSemaphores.back().getSemaphore(); |
| 1243 | |
| 1244 | return angle::Result::Continue(); |
| 1245 | } |
| 1246 | |
| 1247 | const vk::Semaphore *RendererVk::getSubmitLastSignaledSemaphore(vk::Context *context) |
| 1248 | { |
| 1249 | const vk::Semaphore *semaphore = mSubmitLastSignaledSemaphore.getSemaphore(); |
| 1250 | |
| 1251 | // Return the semaphore to the pool (which will remain valid and unused until the |
| 1252 | // queue it's about to be waited on has finished execution). The caller is about |
| 1253 | // to wait on it. |
| 1254 | mSubmitSemaphorePool.freeSemaphore(context, &mSubmitLastSignaledSemaphore); |
| 1255 | |
| 1256 | return semaphore; |
| 1257 | } |
| 1258 | |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 1259 | angle::Result RendererVk::getFullScreenClearShaderProgram(vk::Context *context, |
| 1260 | vk::ShaderProgramHelper **programOut) |
Jamie Madill | d47044a | 2018-04-27 11:45:03 -0400 | [diff] [blame] | 1261 | { |
Jamie Madill | dc65c5b | 2018-11-21 11:07:26 -0500 | [diff] [blame] | 1262 | if (!mFullScreenClearShaderProgram.valid()) |
| 1263 | { |
| 1264 | vk::RefCounted<vk::ShaderAndSerial> *fullScreenQuad = nullptr; |
| 1265 | ANGLE_TRY(mShaderLibrary.getShader(context, vk::InternalShaderID::FullScreenQuad_vert, |
| 1266 | &fullScreenQuad)); |
| 1267 | |
| 1268 | vk::RefCounted<vk::ShaderAndSerial> *pushConstantColor = nullptr; |
| 1269 | ANGLE_TRY(mShaderLibrary.getShader(context, vk::InternalShaderID::PushConstantColor_frag, |
| 1270 | &pushConstantColor)); |
| 1271 | |
| 1272 | mFullScreenClearShaderProgram.setShader(gl::ShaderType::Vertex, fullScreenQuad); |
| 1273 | mFullScreenClearShaderProgram.setShader(gl::ShaderType::Fragment, pushConstantColor); |
| 1274 | } |
| 1275 | |
| 1276 | *programOut = &mFullScreenClearShaderProgram; |
| 1277 | return angle::Result::Continue(); |
Jamie Madill | d47044a | 2018-04-27 11:45:03 -0400 | [diff] [blame] | 1278 | } |
Luc Ferron | 9096836 | 2018-05-04 08:47:22 -0400 | [diff] [blame] | 1279 | |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1280 | angle::Result RendererVk::getTimestamp(vk::Context *context, uint64_t *timestampOut) |
| 1281 | { |
| 1282 | // The intent of this function is to query the timestamp without stalling the GPU. Currently, |
| 1283 | // that seems impossible, so instead, we are going to make a small submission with just a |
| 1284 | // timestamp query. First, the disjoint timer query extension says: |
| 1285 | // |
| 1286 | // > This will return the GL time after all previous commands have reached the GL server but |
| 1287 | // have not yet necessarily executed. |
| 1288 | // |
| 1289 | // The previous commands are stored in the command graph at the moment and are not yet flushed. |
| 1290 | // The wording allows us to make a submission to get the timestamp without performing a flush. |
| 1291 | // |
| 1292 | // Second: |
| 1293 | // |
| 1294 | // > By using a combination of this synchronous get command and the asynchronous timestamp query |
| 1295 | // object target, applications can measure the latency between when commands reach the GL server |
| 1296 | // and when they are realized in the framebuffer. |
| 1297 | // |
| 1298 | // This fits with the above strategy as well, although inevitably we are possibly introducing a |
| 1299 | // GPU bubble. This function directly generates a command buffer and submits it instead of |
| 1300 | // using the other member functions. This is to avoid changing any state, such as the queue |
| 1301 | // serial. |
| 1302 | |
| 1303 | // Create a query used to receive the GPU timestamp |
| 1304 | vk::Scoped<vk::DynamicQueryPool> timestampQueryPool(mDevice); |
| 1305 | vk::QueryHelper timestampQuery; |
| 1306 | ANGLE_TRY(timestampQueryPool.get().init(context, VK_QUERY_TYPE_TIMESTAMP, 1)); |
| 1307 | ANGLE_TRY(timestampQueryPool.get().allocateQuery(context, ×tampQuery)); |
| 1308 | |
| 1309 | // Record the command buffer |
| 1310 | vk::Scoped<vk::CommandBuffer> commandBatch(mDevice); |
| 1311 | vk::CommandBuffer &commandBuffer = commandBatch.get(); |
| 1312 | |
| 1313 | VkCommandBufferAllocateInfo commandBufferInfo = {}; |
| 1314 | commandBufferInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; |
| 1315 | commandBufferInfo.commandPool = mCommandPool.getHandle(); |
| 1316 | commandBufferInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; |
| 1317 | commandBufferInfo.commandBufferCount = 1; |
| 1318 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1319 | ANGLE_VK_TRY(context, commandBuffer.init(mDevice, commandBufferInfo)); |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1320 | |
| 1321 | VkCommandBufferBeginInfo beginInfo = {}; |
| 1322 | beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; |
| 1323 | beginInfo.flags = 0; |
| 1324 | beginInfo.pInheritanceInfo = nullptr; |
| 1325 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1326 | ANGLE_VK_TRY(context, commandBuffer.begin(beginInfo)); |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1327 | |
| 1328 | commandBuffer.resetQueryPool(timestampQuery.getQueryPool()->getHandle(), |
| 1329 | timestampQuery.getQuery(), 1); |
| 1330 | commandBuffer.writeTimestamp(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, |
| 1331 | timestampQuery.getQueryPool()->getHandle(), |
| 1332 | timestampQuery.getQuery()); |
| 1333 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1334 | ANGLE_VK_TRY(context, commandBuffer.end()); |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1335 | |
| 1336 | // Create fence for the submission |
| 1337 | VkFenceCreateInfo fenceInfo = {}; |
| 1338 | fenceInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; |
| 1339 | fenceInfo.flags = 0; |
| 1340 | |
| 1341 | vk::Scoped<vk::Fence> fence(mDevice); |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1342 | ANGLE_VK_TRY(context, fence.get().init(mDevice, fenceInfo)); |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1343 | |
| 1344 | // Submit the command buffer |
| 1345 | VkSubmitInfo submitInfo = {}; |
| 1346 | submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; |
| 1347 | submitInfo.waitSemaphoreCount = 0; |
| 1348 | submitInfo.pWaitSemaphores = nullptr; |
| 1349 | submitInfo.pWaitDstStageMask = nullptr; |
| 1350 | submitInfo.commandBufferCount = 1; |
| 1351 | submitInfo.pCommandBuffers = commandBuffer.ptr(); |
| 1352 | submitInfo.signalSemaphoreCount = 0; |
| 1353 | submitInfo.pSignalSemaphores = nullptr; |
| 1354 | |
| 1355 | ANGLE_VK_TRY(context, vkQueueSubmit(mQueue, 1, &submitInfo, fence.get().getHandle())); |
| 1356 | |
| 1357 | // Wait for the submission to finish. Given no semaphores, there is hope that it would execute |
| 1358 | // in parallel with what's already running on the GPU. |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1359 | ANGLE_VK_TRY(context, fence.get().wait(mDevice, kMaxFenceWaitTimeNs)); |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1360 | |
| 1361 | // Get the query results |
| 1362 | constexpr VkQueryResultFlags queryFlags = VK_QUERY_RESULT_WAIT_BIT | VK_QUERY_RESULT_64_BIT; |
| 1363 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1364 | ANGLE_VK_TRY(context, timestampQuery.getQueryPool()->getResults( |
| 1365 | mDevice, timestampQuery.getQuery(), 1, sizeof(*timestampOut), |
| 1366 | timestampOut, sizeof(*timestampOut), queryFlags)); |
Shahbaz Youssefi | 749589f | 2018-10-25 12:48:49 -0400 | [diff] [blame] | 1367 | |
| 1368 | timestampQueryPool.get().freeQuery(context, ×tampQuery); |
| 1369 | |
| 1370 | return angle::Result::Continue(); |
| 1371 | } |
| 1372 | |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1373 | angle::Result RendererVk::synchronizeCpuGpuTime(vk::Context *context) |
| 1374 | { |
| 1375 | ASSERT(mGpuEventsEnabled); |
| 1376 | |
| 1377 | angle::PlatformMethods *platform = ANGLEPlatformCurrent(); |
| 1378 | ASSERT(platform); |
| 1379 | |
| 1380 | // To synchronize CPU and GPU times, we need to get the CPU timestamp as close as possible to |
| 1381 | // the GPU timestamp. The process of getting the GPU timestamp is as follows: |
| 1382 | // |
| 1383 | // CPU GPU |
| 1384 | // |
| 1385 | // Record command buffer |
| 1386 | // with timestamp query |
| 1387 | // |
| 1388 | // Submit command buffer |
| 1389 | // |
| 1390 | // Post-submission work Begin execution |
| 1391 | // |
| 1392 | // ???? Write timstamp Tgpu |
| 1393 | // |
| 1394 | // ???? End execution |
| 1395 | // |
| 1396 | // ???? Return query results |
| 1397 | // |
| 1398 | // ???? |
| 1399 | // |
| 1400 | // Get query results |
| 1401 | // |
| 1402 | // The areas of unknown work (????) on the CPU indicate that the CPU may or may not have |
| 1403 | // finished post-submission work while the GPU is executing in parallel. With no further work, |
| 1404 | // querying CPU timestamps before submission and after getting query results give the bounds to |
| 1405 | // Tgpu, which could be quite large. |
| 1406 | // |
| 1407 | // Using VkEvents, the GPU can be made to wait for the CPU and vice versa, in an effort to |
| 1408 | // reduce this range. This function implements the following procedure: |
| 1409 | // |
| 1410 | // CPU GPU |
| 1411 | // |
| 1412 | // Record command buffer |
| 1413 | // with timestamp query |
| 1414 | // |
| 1415 | // Submit command buffer |
| 1416 | // |
| 1417 | // Post-submission work Begin execution |
| 1418 | // |
| 1419 | // ???? Set Event GPUReady |
| 1420 | // |
| 1421 | // Wait on Event GPUReady Wait on Event CPUReady |
| 1422 | // |
| 1423 | // Get CPU Time Ts Wait on Event CPUReady |
| 1424 | // |
| 1425 | // Set Event CPUReady Wait on Event CPUReady |
| 1426 | // |
| 1427 | // Get CPU Time Tcpu Get GPU Time Tgpu |
| 1428 | // |
| 1429 | // Wait on Event GPUDone Set Event GPUDone |
| 1430 | // |
| 1431 | // Get CPU Time Te End Execution |
| 1432 | // |
| 1433 | // Idle Return query results |
| 1434 | // |
| 1435 | // Get query results |
| 1436 | // |
| 1437 | // If Te-Ts > epsilon, a GPU or CPU interruption can be assumed and the operation can be |
| 1438 | // retried. Once Te-Ts < epsilon, Tcpu can be taken to presumably match Tgpu. Finding an |
| 1439 | // epsilon that's valid for all devices may be difficult, so the loop can be performed only a |
| 1440 | // limited number of times and the Tcpu,Tgpu pair corresponding to smallest Te-Ts used for |
| 1441 | // calibration. |
| 1442 | // |
| 1443 | // Note: Once VK_EXT_calibrated_timestamps is ubiquitous, this should be redone. |
| 1444 | |
| 1445 | // Make sure nothing is running |
| 1446 | ASSERT(mCommandGraph.empty()); |
| 1447 | |
| 1448 | TRACE_EVENT0("gpu.angle", "RendererVk::synchronizeCpuGpuTime"); |
| 1449 | |
| 1450 | // Create a query used to receive the GPU timestamp |
| 1451 | vk::QueryHelper timestampQuery; |
| 1452 | ANGLE_TRY(mGpuEventQueryPool.allocateQuery(context, ×tampQuery)); |
| 1453 | |
| 1454 | // Create the three events |
| 1455 | VkEventCreateInfo eventCreateInfo = {}; |
| 1456 | eventCreateInfo.sType = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO; |
| 1457 | eventCreateInfo.flags = 0; |
| 1458 | |
| 1459 | vk::Scoped<vk::Event> cpuReady(mDevice), gpuReady(mDevice), gpuDone(mDevice); |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1460 | ANGLE_VK_TRY(context, cpuReady.get().init(mDevice, eventCreateInfo)); |
| 1461 | ANGLE_VK_TRY(context, gpuReady.get().init(mDevice, eventCreateInfo)); |
| 1462 | ANGLE_VK_TRY(context, gpuDone.get().init(mDevice, eventCreateInfo)); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1463 | |
| 1464 | constexpr uint32_t kRetries = 10; |
| 1465 | |
| 1466 | // Time suffixes used are S for seconds and Cycles for cycles |
| 1467 | double tightestRangeS = 1e6f; |
| 1468 | double TcpuS = 0; |
| 1469 | uint64_t TgpuCycles = 0; |
| 1470 | for (uint32_t i = 0; i < kRetries; ++i) |
| 1471 | { |
| 1472 | // Reset the events |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1473 | ANGLE_VK_TRY(context, cpuReady.get().reset(mDevice)); |
| 1474 | ANGLE_VK_TRY(context, gpuReady.get().reset(mDevice)); |
| 1475 | ANGLE_VK_TRY(context, gpuDone.get().reset(mDevice)); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1476 | |
| 1477 | // Record the command buffer |
| 1478 | vk::Scoped<vk::CommandBuffer> commandBatch(mDevice); |
| 1479 | vk::CommandBuffer &commandBuffer = commandBatch.get(); |
| 1480 | |
| 1481 | VkCommandBufferAllocateInfo commandBufferInfo = {}; |
| 1482 | commandBufferInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; |
| 1483 | commandBufferInfo.commandPool = mCommandPool.getHandle(); |
| 1484 | commandBufferInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; |
| 1485 | commandBufferInfo.commandBufferCount = 1; |
| 1486 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1487 | ANGLE_VK_TRY(context, commandBuffer.init(mDevice, commandBufferInfo)); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1488 | |
| 1489 | VkCommandBufferBeginInfo beginInfo = {}; |
| 1490 | beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; |
| 1491 | beginInfo.flags = 0; |
| 1492 | beginInfo.pInheritanceInfo = nullptr; |
| 1493 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1494 | ANGLE_VK_TRY(context, commandBuffer.begin(beginInfo)); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1495 | |
| 1496 | commandBuffer.setEvent(gpuReady.get(), VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT); |
| 1497 | commandBuffer.waitEvents(1, cpuReady.get().ptr(), VK_PIPELINE_STAGE_HOST_BIT, |
| 1498 | VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, 0, nullptr, 0, nullptr, 0, |
| 1499 | nullptr); |
| 1500 | |
| 1501 | commandBuffer.resetQueryPool(timestampQuery.getQueryPool()->getHandle(), |
| 1502 | timestampQuery.getQuery(), 1); |
| 1503 | commandBuffer.writeTimestamp(VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, |
| 1504 | timestampQuery.getQueryPool()->getHandle(), |
| 1505 | timestampQuery.getQuery()); |
| 1506 | |
| 1507 | commandBuffer.setEvent(gpuDone.get(), VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT); |
| 1508 | |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1509 | ANGLE_VK_TRY(context, commandBuffer.end()); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1510 | |
| 1511 | // Submit the command buffer |
| 1512 | angle::FixedVector<VkSemaphore, kMaxWaitSemaphores> waitSemaphores; |
| 1513 | angle::FixedVector<VkPipelineStageFlags, kMaxWaitSemaphores> waitStageMasks; |
| 1514 | getSubmitWaitSemaphores(context, &waitSemaphores, &waitStageMasks); |
| 1515 | |
| 1516 | VkSubmitInfo submitInfo = {}; |
| 1517 | submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; |
| 1518 | submitInfo.waitSemaphoreCount = static_cast<uint32_t>(waitSemaphores.size()); |
| 1519 | submitInfo.pWaitSemaphores = waitSemaphores.data(); |
| 1520 | submitInfo.pWaitDstStageMask = waitStageMasks.data(); |
| 1521 | submitInfo.commandBufferCount = 1; |
| 1522 | submitInfo.pCommandBuffers = commandBuffer.ptr(); |
| 1523 | submitInfo.signalSemaphoreCount = 0; |
| 1524 | submitInfo.pSignalSemaphores = nullptr; |
| 1525 | |
| 1526 | ANGLE_TRY(submitFrame(context, submitInfo, std::move(commandBuffer))); |
| 1527 | |
| 1528 | // Wait for GPU to be ready. This is a short busy wait. |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1529 | VkResult result = VK_EVENT_RESET; |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1530 | do |
| 1531 | { |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1532 | result = gpuReady.get().getStatus(mDevice); |
| 1533 | if (result != VK_EVENT_SET && result != VK_EVENT_RESET) |
| 1534 | { |
| 1535 | ANGLE_VK_TRY(context, result); |
| 1536 | } |
| 1537 | } while (result == VK_EVENT_RESET); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1538 | |
| 1539 | double TsS = platform->monotonicallyIncreasingTime(platform); |
| 1540 | |
| 1541 | // Tell the GPU to go ahead with the timestamp query. |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1542 | ANGLE_VK_TRY(context, cpuReady.get().set(mDevice)); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1543 | double cpuTimestampS = platform->monotonicallyIncreasingTime(platform); |
| 1544 | |
| 1545 | // Wait for GPU to be done. Another short busy wait. |
| 1546 | do |
| 1547 | { |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1548 | result = gpuDone.get().getStatus(mDevice); |
| 1549 | if (result != VK_EVENT_SET && result != VK_EVENT_RESET) |
| 1550 | { |
| 1551 | ANGLE_VK_TRY(context, result); |
| 1552 | } |
| 1553 | } while (result == VK_EVENT_RESET); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1554 | |
| 1555 | double TeS = platform->monotonicallyIncreasingTime(platform); |
| 1556 | |
| 1557 | // Get the query results |
| 1558 | ANGLE_TRY(finishToSerial(context, getLastSubmittedQueueSerial())); |
| 1559 | |
| 1560 | constexpr VkQueryResultFlags queryFlags = VK_QUERY_RESULT_WAIT_BIT | VK_QUERY_RESULT_64_BIT; |
| 1561 | |
| 1562 | uint64_t gpuTimestampCycles = 0; |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1563 | ANGLE_VK_TRY(context, timestampQuery.getQueryPool()->getResults( |
| 1564 | mDevice, timestampQuery.getQuery(), 1, sizeof(gpuTimestampCycles), |
| 1565 | &gpuTimestampCycles, sizeof(gpuTimestampCycles), queryFlags)); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1566 | |
| 1567 | // Use the first timestamp queried as origin. |
| 1568 | if (mGpuEventTimestampOrigin == 0) |
| 1569 | { |
| 1570 | mGpuEventTimestampOrigin = gpuTimestampCycles; |
| 1571 | } |
| 1572 | |
| 1573 | // Take these CPU and GPU timestamps if there is better confidence. |
| 1574 | double confidenceRangeS = TeS - TsS; |
| 1575 | if (confidenceRangeS < tightestRangeS) |
| 1576 | { |
| 1577 | tightestRangeS = confidenceRangeS; |
| 1578 | TcpuS = cpuTimestampS; |
| 1579 | TgpuCycles = gpuTimestampCycles; |
| 1580 | } |
| 1581 | } |
| 1582 | |
| 1583 | mGpuEventQueryPool.freeQuery(context, ×tampQuery); |
| 1584 | |
| 1585 | // timestampPeriod gives nanoseconds/cycle. |
| 1586 | double TgpuS = (TgpuCycles - mGpuEventTimestampOrigin) * |
| 1587 | static_cast<double>(mPhysicalDeviceProperties.limits.timestampPeriod) / |
| 1588 | 1'000'000'000.0; |
| 1589 | |
| 1590 | flushGpuEvents(TgpuS, TcpuS); |
| 1591 | |
| 1592 | mGpuClockSync.gpuTimestampS = TgpuS; |
| 1593 | mGpuClockSync.cpuTimestampS = TcpuS; |
| 1594 | |
| 1595 | return angle::Result::Continue(); |
| 1596 | } |
| 1597 | |
| 1598 | angle::Result RendererVk::traceGpuEventImpl(vk::Context *context, |
| 1599 | vk::CommandBuffer *commandBuffer, |
| 1600 | char phase, |
| 1601 | const char *name) |
| 1602 | { |
| 1603 | ASSERT(mGpuEventsEnabled); |
| 1604 | |
| 1605 | GpuEventQuery event; |
| 1606 | |
| 1607 | event.name = name; |
| 1608 | event.phase = phase; |
| 1609 | event.serial = mCurrentQueueSerial; |
| 1610 | |
| 1611 | ANGLE_TRY(mGpuEventQueryPool.allocateQuery(context, &event.queryPoolIndex, &event.queryIndex)); |
| 1612 | |
| 1613 | commandBuffer->resetQueryPool( |
| 1614 | mGpuEventQueryPool.getQueryPool(event.queryPoolIndex)->getHandle(), event.queryIndex, 1); |
| 1615 | commandBuffer->writeTimestamp( |
| 1616 | VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, |
| 1617 | mGpuEventQueryPool.getQueryPool(event.queryPoolIndex)->getHandle(), event.queryIndex); |
| 1618 | |
| 1619 | mInFlightGpuEventQueries.push_back(std::move(event)); |
| 1620 | |
| 1621 | return angle::Result::Continue(); |
| 1622 | } |
| 1623 | |
| 1624 | angle::Result RendererVk::checkCompletedGpuEvents(vk::Context *context) |
| 1625 | { |
| 1626 | ASSERT(mGpuEventsEnabled); |
| 1627 | |
| 1628 | angle::PlatformMethods *platform = ANGLEPlatformCurrent(); |
| 1629 | ASSERT(platform); |
| 1630 | |
| 1631 | int finishedCount = 0; |
| 1632 | |
| 1633 | for (GpuEventQuery &eventQuery : mInFlightGpuEventQueries) |
| 1634 | { |
| 1635 | // Only check the timestamp query if the submission has finished. |
| 1636 | if (eventQuery.serial > mLastCompletedQueueSerial) |
| 1637 | { |
| 1638 | break; |
| 1639 | } |
| 1640 | |
| 1641 | // See if the results are available. |
| 1642 | uint64_t gpuTimestampCycles = 0; |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1643 | VkResult result = mGpuEventQueryPool.getQueryPool(eventQuery.queryPoolIndex) |
| 1644 | ->getResults(mDevice, eventQuery.queryIndex, 1, |
| 1645 | sizeof(gpuTimestampCycles), &gpuTimestampCycles, |
| 1646 | sizeof(gpuTimestampCycles), VK_QUERY_RESULT_64_BIT); |
| 1647 | if (result == VK_NOT_READY) |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1648 | { |
| 1649 | break; |
| 1650 | } |
Yuly Novikov | 2778029 | 2018-11-09 11:19:49 -0500 | [diff] [blame] | 1651 | ANGLE_VK_TRY(context, result); |
Shahbaz Youssefi | 25224e7 | 2018-10-22 11:56:02 -0400 | [diff] [blame] | 1652 | |
| 1653 | mGpuEventQueryPool.freeQuery(context, eventQuery.queryPoolIndex, eventQuery.queryIndex); |
| 1654 | |
| 1655 | GpuEvent event; |
| 1656 | event.gpuTimestampCycles = gpuTimestampCycles; |
| 1657 | event.name = eventQuery.name; |
| 1658 | event.phase = eventQuery.phase; |
| 1659 | |
| 1660 | mGpuEvents.emplace_back(event); |
| 1661 | |
| 1662 | ++finishedCount; |
| 1663 | } |
| 1664 | |
| 1665 | mInFlightGpuEventQueries.erase(mInFlightGpuEventQueries.begin(), |
| 1666 | mInFlightGpuEventQueries.begin() + finishedCount); |
| 1667 | |
| 1668 | return angle::Result::Continue(); |
| 1669 | } |
| 1670 | |
| 1671 | void RendererVk::flushGpuEvents(double nextSyncGpuTimestampS, double nextSyncCpuTimestampS) |
| 1672 | { |
| 1673 | if (mGpuEvents.size() == 0) |
| 1674 | { |
| 1675 | return; |
| 1676 | } |
| 1677 | |
| 1678 | angle::PlatformMethods *platform = ANGLEPlatformCurrent(); |
| 1679 | ASSERT(platform); |
| 1680 | |
| 1681 | // Find the slope of the clock drift for adjustment |
| 1682 | double lastGpuSyncTimeS = mGpuClockSync.gpuTimestampS; |
| 1683 | double lastGpuSyncDiffS = mGpuClockSync.cpuTimestampS - mGpuClockSync.gpuTimestampS; |
| 1684 | double gpuSyncDriftSlope = 0; |
| 1685 | |
| 1686 | double nextGpuSyncTimeS = nextSyncGpuTimestampS; |
| 1687 | double nextGpuSyncDiffS = nextSyncCpuTimestampS - nextSyncGpuTimestampS; |
| 1688 | |
| 1689 | // No gpu trace events should have been generated before the clock sync, so if there is no |
| 1690 | // "previous" clock sync, there should be no gpu events (i.e. the function early-outs above). |
| 1691 | ASSERT(mGpuClockSync.gpuTimestampS != std::numeric_limits<double>::max() && |
| 1692 | mGpuClockSync.cpuTimestampS != std::numeric_limits<double>::max()); |
| 1693 | |
| 1694 | gpuSyncDriftSlope = |
| 1695 | (nextGpuSyncDiffS - lastGpuSyncDiffS) / (nextGpuSyncTimeS - lastGpuSyncTimeS); |
| 1696 | |
| 1697 | for (const GpuEvent &event : mGpuEvents) |
| 1698 | { |
| 1699 | double gpuTimestampS = |
| 1700 | (event.gpuTimestampCycles - mGpuEventTimestampOrigin) * |
| 1701 | static_cast<double>(mPhysicalDeviceProperties.limits.timestampPeriod) * 1e-9; |
| 1702 | |
| 1703 | // Account for clock drift. |
| 1704 | gpuTimestampS += lastGpuSyncDiffS + gpuSyncDriftSlope * (gpuTimestampS - lastGpuSyncTimeS); |
| 1705 | |
| 1706 | // Generate the trace now that the GPU timestamp is available and clock drifts are accounted |
| 1707 | // for. |
| 1708 | static long long eventId = 1; |
| 1709 | static const unsigned char *categoryEnabled = |
| 1710 | TRACE_EVENT_API_GET_CATEGORY_ENABLED("gpu.angle.gpu"); |
| 1711 | platform->addTraceEvent(platform, event.phase, categoryEnabled, event.name, eventId++, |
| 1712 | gpuTimestampS, 0, nullptr, nullptr, nullptr, TRACE_EVENT_FLAG_NONE); |
| 1713 | } |
| 1714 | |
| 1715 | mGpuEvents.clear(); |
| 1716 | } |
| 1717 | |
Jamie Madill | aaca96e | 2018-06-12 10:19:48 -0400 | [diff] [blame] | 1718 | uint32_t GetUniformBufferDescriptorCount() |
| 1719 | { |
| 1720 | return kUniformBufferDescriptorsPerDescriptorSet; |
| 1721 | } |
| 1722 | |
Jamie Madill | 9e54b5a | 2016-05-25 12:57:39 -0400 | [diff] [blame] | 1723 | } // namespace rx |