diff --git a/ash/src/lib.rs b/ash/src/lib.rs index 59b1a69..79c3dcb 100644 --- a/ash/src/lib.rs +++ b/ash/src/lib.rs @@ -24,6 +24,7 @@ impl<'r, T> RawPtr for Option<&'r T> { fn as_raw_ptr(&self) -> *const T { match self { &Some(inner) => inner as *const T, + _ => ::std::ptr::null(), } } diff --git a/generator/Vulkan-Docs b/generator/Vulkan-Docs index ce60b9c..ee13fc3 160000 --- a/generator/Vulkan-Docs +++ b/generator/Vulkan-Docs @@ -1 +1 @@ -Subproject commit ce60b9c88745ecded74296dfbe69dae7c1fb2e62 +Subproject commit ee13fc355fae06ffcd36ee09a98f12132d95dfc0 diff --git a/generator/src/lib.rs b/generator/src/lib.rs index 35da101..a738836 100644 --- a/generator/src/lib.rs +++ b/generator/src/lib.rs @@ -370,34 +370,47 @@ pub enum EnumType { } pub fn generate_enum(_enum: &vkxml::Enumeration) -> EnumType { + println!("{}", _enum.name); let name = &_enum.name[2..]; - let _name = name.replace("FlagBits", ""); + let _name = name.replace("FlagBits", "Flags"); if name.contains("Bit") { + let ident = Ident::from(_name.as_str()); + let all_bits = _enum + .elements + .iter() + .filter_map(|elem| match elem { + vkxml::EnumerationElement::Enum(ref constant) => { + let c = Constant::from_constant(constant); + c.value() + } + _ => None, + }) + .fold(0, |acc, next| acc | next); + let all_bits_term = Term::intern(&format!("0b{:b}", all_bits)); + let variants = _enum.elements.iter().filter_map(|elem| { let (variant_name, value) = match *elem { vkxml::EnumerationElement::Enum(ref constant) => { + let variant_name = &constant.name[3..]; let c = Constant::from_constant(constant); if c.value().map(|v| v == 0).unwrap_or(false) { return None; } - (constant.name.as_str(), c.to_tokens()) + (variant_name, c.to_tokens()) } _ => { return None; } }; - let variant_ident = to_variant_ident(&_name, variant_name); + let variant_ident = Ident::from(variant_name); Some(quote!{ - #variant_ident = #value + pub const #variant_ident: #ident = #ident { flags: #value }; }) }); - let ident = Ident::from(_name.as_str()); let q = quote!{ - #[derive(Copy, Clone, Debug, EnumFlags)] - pub enum #ident { - #(#variants,)* - } + #(#variants)* + vk_bitflags_wrapped!(#ident, #all_bits_term, Flags); }; EnumType::Bitflags(q) } else { @@ -581,7 +594,10 @@ pub fn write_source_code(spec: &vkxml::Registry) { }, ); - let definition_code: Vec<_> = definitions.into_iter().filter_map(generate_definition).collect(); + let definition_code: Vec<_> = definitions + .into_iter() + .filter_map(generate_definition) + .collect(); let feature_code: Vec<_> = features .iter() diff --git a/generator/vk.xml b/generator/vk.xml index 3d7a35b..7018bbe 100644 --- a/generator/vk.xml +++ b/generator/vk.xml @@ -15,8 +15,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ------------------------------------------------------------------------- +---- Exceptions to the Apache 2.0 License: ---- +As an exception, if you use this Software to generate code and portions of +this Software are embedded into the generated code as a result, you may +redistribute such product without providing attribution as would otherwise +be required by Sections 4(a), 4(b) and 4(d) of the License. + +In addition, if you combine or link code generated by this Software with +software that is licensed under the GPLv2 or the LGPL v2.0 or 2.1 +("`Combined Software`") and if a court of competent jurisdiction determines +that the patent provision (Section 3), the indemnity provision (Section 9) +or other Section of the License conflicts with the conditions of the +applicable GPL or LGPL license, you may retroactively and prospectively +choose to deem waived or otherwise exclude such Section(s) of the License, +but only in their entirety and only with respect to the Combined Software. + + + This file, vk.xml, is the Vulkan API Registry. It is a critically important and normative part of the Vulkan Specification, including a canonical machine-readable definition of the API, parameter and member validation @@ -24,7 +40,8 @@ language incorporated into the Specification and reference pages, and other material which is registered by Khronos, such as tags used by extension and layer authors. The authoritative public version of vk.xml is maintained in the master branch of the Khronos Vulkan GitHub project. The authoritative -private version is maintained in the 1.0 branch of the member gitlab server. +private version is maintained in the master branch of the member gitlab +server. @@ -49,30 +66,30 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - + + + - - + + - - - + + + - + - - + + - - + + @@ -136,7 +153,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. // Vulkan 1.1 version number #define VK_API_VERSION_1_1 VK_MAKE_VERSION(1, 1, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 70 +#define VK_HEADER_VERSION 76 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -156,6 +173,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. struct ANativeWindow; + struct AHardwareBuffer; typedef uint32_t VkSampleMask; typedef uint32_t VkBool32; @@ -293,6 +311,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. typedef VkFlags VkDebugUtilsMessengerCreateFlagsEXT; typedef VkFlags VkDebugUtilsMessengerCallbackDataFlagsEXT; typedef VkFlags VkPipelineRasterizationConservativeStateCreateFlagsEXT; + typedef VkFlags VkDescriptorBindingFlagsEXT; Types which can be void pointers or class pointers, selected at compile time VK_DEFINE_HANDLE(VkInstance) @@ -424,6 +443,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + Extensions @@ -543,6 +563,14 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pUserData); Struct types + + VkStructureType sType + struct VkBaseOutStructure* pNext + + + VkStructureType sType + const struct VkBaseInStructure* pNext + int32_t x int32_t y @@ -1406,7 +1434,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t maxGeometryOutputVerticesmax number of vertices that can be emitted in geometry stage uint32_t maxGeometryTotalOutputComponentsmax total number of components (all vertices) written in geometry stage fragment stage limits - uint32_t maxFragmentInputComponentsmax number of input compontents read in fragment stage + uint32_t maxFragmentInputComponentsmax number of input components read in fragment stage uint32_t maxFragmentOutputAttachmentsmax number of output attachments written in fragment stage uint32_t maxFragmentDualSrcAttachmentsmax number of output attachments written when using dual source blending uint32_t maxFragmentCombinedOutputResourcesmax total number of storage buffers, storage images and output buffers @@ -1573,7 +1601,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkRect2D srcRectRectangle within the presentable image to read pixel data from when presenting to the display. VkRect2D dstRectRectangle within the current display mode's visible region to display srcRectangle in. VkBool32 persistentFor smart displays, use buffered mode. If the display properties member "persistentMode" is VK_FALSE, this member must always be VK_FALSE. @@ -1686,7 +1714,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkRasterizationOrderAMD rasterizationOrderRasterization order to use for the pipeline @@ -1713,17 +1741,17 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkBool32 dedicatedAllocationWhether this image uses a dedicated allocation VkStructureType sType - const void* pNext + const void* pNext VkBool32 dedicatedAllocationWhether this buffer uses a dedicated allocation VkStructureType sType - const void* pNext + const void* pNext VkImage imageImage that this allocation will be bound to VkBuffer bufferBuffer that this allocation will be bound to @@ -1757,7 +1785,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t acquireCount const VkDeviceMemory* pAcquireSyncs const uint64_t* pAcquireKeys @@ -1935,7 +1963,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t swapchainCountCopy of VkPresentInfoKHR::swapchainCount const VkPresentRegionKHR* pRegionsThe regions that have changed @@ -1963,7 +1991,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkExternalMemoryHandleTypeFlagBits handleType @@ -2059,7 +2087,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t acquireCount const VkDeviceMemory* pAcquireSyncs const uint64_t* pAcquireKeys @@ -2106,7 +2134,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreValuesCount const uint64_t* pWaitSemaphoreValues uint32_t signalSemaphoreValuesCount @@ -2259,7 +2287,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkMemoryAllocateFlags flags uint32_t deviceMask @@ -2298,7 +2326,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t deviceMask uint32_t deviceRenderAreaCount const VkRect2D* pDeviceRenderAreas @@ -2306,13 +2334,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t deviceMask VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreCount const uint32_t* pWaitSemaphoreDeviceIndices uint32_t commandBufferCount @@ -2323,7 +2351,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t resourceDeviceIndex uint32_t memoryDeviceIndex @@ -2336,12 +2364,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSwapchainKHR swapchain VkStructureType sType - const void* pNext + const void* pNext VkSwapchainKHR swapchain uint32_t imageIndex @@ -2356,21 +2384,21 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t swapchainCount const uint32_t* pDeviceMasks VkDeviceGroupPresentModeFlagBitsKHR mode VkStructureType sType - const void* pNext + const void* pNext uint32_t physicalDeviceCount const VkPhysicalDevice* pPhysicalDevices VkStructureType sType - const void* pNext + const void* pNext VkDeviceGroupPresentModeFlagsKHR modes @@ -2426,7 +2454,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t swapchainCountCopy of VkPresentInfoKHR::swapchainCount const VkPresentTimeGOOGLE* pTimesThe earliest times to present images @@ -2452,7 +2480,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkBool32 viewportWScalingEnable uint32_t viewportCount const VkViewportWScalingNV* pViewportWScalings @@ -2516,6 +2544,32 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pNext VkSurfaceFormatKHR surfaceFormat + + VkStructureType sType + void* pNext + VkDisplayPropertiesKHR displayProperties + + + VkStructureType sType + void* pNext + VkDisplayPlanePropertiesKHR displayPlaneProperties + + + VkStructureType sType + void* pNext + VkDisplayModePropertiesKHR displayModeProperties + + + VkStructureType sType + const void* pNext + VkDisplayModeKHR mode + uint32_t planeIndex + + + VkStructureType sType + void* pNext + VkDisplayPlaneCapabilitiesKHR capabilities + VkStructureType sType void* pNext @@ -2602,7 +2656,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSamplerYcbcrConversion conversion @@ -2621,13 +2675,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkImageAspectFlagBits planeAspect VkStructureType sType - const void* pNext + const void* pNext VkImageAspectFlagBits planeAspect @@ -2903,10 +2957,27 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkBool32 conservativePointAndLineRasterizationtrue if conservative rasterization also applies to points and lines VkBool32 degenerateTrianglesRasterizedtrue if degenerate triangles (those with zero area after snap) are rasterized VkBool32 degenerateLinesRasterizedtrue if degenerate lines (those with zero length after snap) are rasterized - VkBool32 fullyCoveredFragmentShaderInputVariabletrue if the implementation supports the FullyCoveredEXT SPIR-V builtin fragment shader input - variable + VkBool32 fullyCoveredFragmentShaderInputVariabletrue if the implementation supports the FullyCoveredEXT SPIR-V builtin fragment shader input variable VkBool32 conservativeRasterizationPostDepthCoveragetrue if the implementation supports both conservative rasterization and post depth coverage sample coverage mask + + VkStructureType sType + void* pNextPointer to next structure + uint32_t shaderEngineCountnumber of shader engines + uint32_t shaderArraysPerEngineCountnumber of shader arrays + uint32_t computeUnitsPerShaderArraynumber of CUs per shader array + uint32_t simdPerComputeUnitnumber of SIMDs per compute unit + uint32_t wavefrontsPerSimdnumber of wavefront slots in each SIMD + uint32_t wavefrontSizenumber of threads per wavefront + uint32_t sgprsPerSimdnumber of physical SGPRs per SIMD + uint32_t minSgprAllocationminimum number of SGPRs that can be allocated by a wave + uint32_t maxSgprAllocationnumber of available SGPRs + uint32_t sgprAllocationGranularitySGPRs are allocated in groups of this size + uint32_t vgprsPerSimdnumber of physical VGPRs per SIMD + uint32_t minVgprAllocationminimum number of VGPRs that can be allocated by a wave + uint32_t maxVgprAllocationnumber of available VGPRs + uint32_t vgprAllocationGranularityVGPRs are allocated in groups of this size + VkStructureType sType const void* pNext @@ -2914,13 +2985,81 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkConservativeRasterizationModeEXT conservativeRasterizationMode float extraPrimitiveOverestimationSize + + VkStructureType sType + void* pNext + VkBool32 shaderInputAttachmentArrayDynamicIndexing + VkBool32 shaderUniformTexelBufferArrayDynamicIndexing + VkBool32 shaderStorageTexelBufferArrayDynamicIndexing + VkBool32 shaderUniformBufferArrayNonUniformIndexing + VkBool32 shaderSampledImageArrayNonUniformIndexing + VkBool32 shaderStorageBufferArrayNonUniformIndexing + VkBool32 shaderStorageImageArrayNonUniformIndexing + VkBool32 shaderInputAttachmentArrayNonUniformIndexing + VkBool32 shaderUniformTexelBufferArrayNonUniformIndexing + VkBool32 shaderStorageTexelBufferArrayNonUniformIndexing + VkBool32 descriptorBindingUniformBufferUpdateAfterBind + VkBool32 descriptorBindingSampledImageUpdateAfterBind + VkBool32 descriptorBindingStorageImageUpdateAfterBind + VkBool32 descriptorBindingStorageBufferUpdateAfterBind + VkBool32 descriptorBindingUniformTexelBufferUpdateAfterBind + VkBool32 descriptorBindingStorageTexelBufferUpdateAfterBind + VkBool32 descriptorBindingUpdateUnusedWhilePending + VkBool32 descriptorBindingPartiallyBound + VkBool32 descriptorBindingVariableDescriptorCount + VkBool32 runtimeDescriptorArray + + + VkStructureType sType + void* pNext + uint32_t maxUpdateAfterBindDescriptorsInAllPools + VkBool32 shaderUniformBufferArrayNonUniformIndexingNative + VkBool32 shaderSampledImageArrayNonUniformIndexingNative + VkBool32 shaderStorageBufferArrayNonUniformIndexingNative + VkBool32 shaderStorageImageArrayNonUniformIndexingNative + VkBool32 shaderInputAttachmentArrayNonUniformIndexingNative + VkBool32 robustBufferAccessUpdateAfterBind + VkBool32 quadDivergentImplicitLod + uint32_t maxPerStageDescriptorUpdateAfterBindSamplers + uint32_t maxPerStageDescriptorUpdateAfterBindUniformBuffers + uint32_t maxPerStageDescriptorUpdateAfterBindStorageBuffers + uint32_t maxPerStageDescriptorUpdateAfterBindSampledImages + uint32_t maxPerStageDescriptorUpdateAfterBindStorageImages + uint32_t maxPerStageDescriptorUpdateAfterBindInputAttachments + uint32_t maxPerStageUpdateAfterBindResources + uint32_t maxDescriptorSetUpdateAfterBindSamplers + uint32_t maxDescriptorSetUpdateAfterBindUniformBuffers + uint32_t maxDescriptorSetUpdateAfterBindUniformBuffersDynamic + uint32_t maxDescriptorSetUpdateAfterBindStorageBuffers + uint32_t maxDescriptorSetUpdateAfterBindStorageBuffersDynamic + uint32_t maxDescriptorSetUpdateAfterBindSampledImages + uint32_t maxDescriptorSetUpdateAfterBindStorageImages + uint32_t maxDescriptorSetUpdateAfterBindInputAttachments + + + VkStructureType sType + const void* pNext + uint32_t bindingCount + const VkDescriptorBindingFlagsEXT* pBindingFlags + + + VkStructureType sType + const void* pNext + uint32_t descriptorSetCount + const uint32_t* pDescriptorCounts + + + VkStructureType sType + void* pNext + uint32_t maxVariableDescriptorCount + uint32_t binding uint32_t divisor VkStructureType sType - const void* pNext + const void* pNext uint32_t vertexBindingDivisorCount const VkVertexInputBindingDivisorDescriptionEXT* pVertexBindingDivisors @@ -2929,6 +3068,44 @@ private version is maintained in the 1.0 branch of the member gitlab server. void* pNext uint32_t maxVertexAttribDivisormax value of vertex attribute divisor + + VkStructureType sType + const void* pNext + struct AHardwareBuffer* buffer + + + VkStructureType sType + void* pNext + uint64_t androidHardwareBufferUsage + + + VkStructureType sType + void* pNext + VkDeviceSize allocationSize + uint32_t memoryTypeBits + + + VkStructureType sType + const void* pNext + VkDeviceMemory memory + + + VkStructureType sType + void* pNext + VkFormat format + uint64_t externalFormat + VkFormatFeatureFlags formatFeatures + VkComponentMapping samplerYcbcrConversionComponents + VkSamplerYcbcrModelConversion suggestedYcbcrModel + VkSamplerYcbcrRange suggestedYcbcrRange + VkChromaLocation suggestedXChromaOffset + VkChromaLocation suggestedYChromaOffset + + + VkStructureType sType + void* pNext + uint64_t externalFormat + Vulkan enumerant (token) definitions @@ -3996,6 +4173,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + + @@ -4482,7 +4665,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkDescriptorSetLayout descriptorSetLayout const VkAllocationCallbacks* pAllocator - + VkResult vkCreateDescriptorPool VkDevice device const VkDescriptorPoolCreateInfo* pCreateInfo @@ -5488,7 +5671,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. const VkAllocationCallbacks* pAllocator VkFence* pFence - + VkResult vkGetSwapchainCounterEXT VkDevice device VkSwapchainKHR swapchain @@ -5680,6 +5863,31 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t* pSurfaceFormatCount VkSurfaceFormat2KHR* pSurfaceFormats + + VkResult vkGetPhysicalDeviceDisplayProperties2KHR + VkPhysicalDevice physicalDevice + uint32_t* pPropertyCount + VkDisplayProperties2KHR* pProperties + + + VkResult vkGetPhysicalDeviceDisplayPlaneProperties2KHR + VkPhysicalDevice physicalDevice + uint32_t* pPropertyCount + VkDisplayPlaneProperties2KHR* pProperties + + + VkResult vkGetDisplayModeProperties2KHR + VkPhysicalDevice physicalDevice + VkDisplayKHR display + uint32_t* pPropertyCount + VkDisplayModeProperties2KHR* pProperties + + + VkResult vkGetDisplayPlaneCapabilities2KHR + VkPhysicalDevice physicalDevice + const VkDisplayPlaneInfo2KHR* pDisplayPlaneInfo + VkDisplayPlaneCapabilities2KHR* pCapabilities + void vkGetBufferMemoryRequirements2 VkDevice device @@ -5862,6 +6070,38 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkDeviceSize dstOffset uint32_t marker + + VkResult vkGetAndroidHardwareBufferPropertiesANDROID + VkDevice device + const struct AHardwareBuffer* buffer + VkAndroidHardwareBufferPropertiesANDROID* pProperties + + + VkResult vkGetMemoryAndroidHardwareBufferANDROID + VkDevice device + const VkMemoryGetAndroidHardwareBufferInfoANDROID* pInfo + struct AHardwareBuffer** pBuffer + + + void vkCmdDrawIndirectCountKHR + VkCommandBuffer commandBuffer + VkBuffer buffer + VkDeviceSize offset + VkBuffer countBuffer + VkDeviceSize countBufferOffset + uint32_t maxDrawCount + uint32_t stride + + + void vkCmdDrawIndexedIndirectCountKHR + VkCommandBuffer commandBuffer + VkBuffer buffer + VkDeviceSize offset + VkBuffer countBuffer + VkDeviceSize countBufferOffset + uint32_t maxDrawCount + uint32_t stride + @@ -6086,6 +6326,8 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + @@ -6417,7 +6659,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6432,7 +6674,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6508,7 +6750,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6519,7 +6761,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6530,7 +6772,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6541,7 +6783,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6552,7 +6794,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6563,7 +6805,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6574,7 +6816,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6586,7 +6828,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6607,27 +6849,27 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + @@ -6635,19 +6877,19 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + @@ -6656,25 +6898,25 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + @@ -6692,25 +6934,25 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + @@ -6722,43 +6964,43 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + - + - + - + @@ -6766,7 +7008,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6778,31 +7020,31 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + - + @@ -6816,7 +7058,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6826,25 +7068,25 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + @@ -6880,13 +7122,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + @@ -6899,7 +7141,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6946,7 +7188,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6954,7 +7196,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -6985,7 +7227,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7054,7 +7296,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7082,27 +7324,27 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + - + @@ -7112,7 +7354,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7202,7 +7444,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7273,7 +7515,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7287,21 +7529,19 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - - - + + - + - + @@ -7309,7 +7549,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7391,7 +7631,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7450,7 +7690,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7465,7 +7705,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7488,7 +7728,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7498,7 +7738,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7509,7 +7749,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7529,7 +7769,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7547,13 +7787,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + @@ -7573,7 +7813,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7625,7 +7865,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7648,7 +7888,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7659,7 +7899,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7673,7 +7913,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7736,7 +7976,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7744,10 +7984,24 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + + + + + + + + + @@ -7800,7 +8054,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7828,13 +8082,28 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + + + + + + + + + + - + @@ -7846,13 +8115,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + @@ -7882,7 +8151,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7900,7 +8169,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7918,7 +8187,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7941,7 +8210,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -7976,7 +8245,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -8036,7 +8305,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -8045,19 +8314,19 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + @@ -8067,14 +8336,14 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + @@ -8169,7 +8438,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -8188,7 +8457,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -8213,10 +8482,23 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + + + + + + + + + + + + @@ -8255,7 +8537,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + @@ -8266,31 +8548,33 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + + + - + - + - + - + @@ -8306,25 +8590,25 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + @@ -8341,68 +8625,70 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + - + - + - + - + - + - - + + + + - + - + - + - + @@ -8449,11 +8735,96 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +