aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Graphics.Vulkan/VulkanRenderer.cs')
-rw-r--r--Ryujinx.Graphics.Vulkan/VulkanRenderer.cs609
1 files changed, 609 insertions, 0 deletions
diff --git a/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs b/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
new file mode 100644
index 00000000..c7396630
--- /dev/null
+++ b/Ryujinx.Graphics.Vulkan/VulkanRenderer.cs
@@ -0,0 +1,609 @@
+using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.GAL;
+using Ryujinx.Graphics.Shader;
+using Ryujinx.Graphics.Shader.Translation;
+using Ryujinx.Graphics.Vulkan.Queries;
+using Silk.NET.Vulkan;
+using Silk.NET.Vulkan.Extensions.EXT;
+using Silk.NET.Vulkan.Extensions.KHR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.Graphics.Vulkan
+{
+ public sealed class VulkanRenderer : IRenderer
+ {
+ private Instance _instance;
+ private SurfaceKHR _surface;
+ private PhysicalDevice _physicalDevice;
+ private Device _device;
+ private uint _queueFamilyIndex;
+ private WindowBase _window;
+
+ internal FormatCapabilities FormatCapabilities { get; private set; }
+ internal HardwareCapabilities Capabilities;
+
+ internal Vk Api { get; private set; }
+ internal KhrSurface SurfaceApi { get; private set; }
+ internal KhrSwapchain SwapchainApi { get; private set; }
+ internal ExtConditionalRendering ConditionalRenderingApi { get; private set; }
+ internal ExtExtendedDynamicState ExtendedDynamicStateApi { get; private set; }
+ internal KhrPushDescriptor PushDescriptorApi { get; private set; }
+ internal ExtTransformFeedback TransformFeedbackApi { get; private set; }
+ internal KhrDrawIndirectCount DrawIndirectCountApi { get; private set; }
+ internal ExtDebugReport DebugReportApi { get; private set; }
+
+ internal uint QueueFamilyIndex { get; private set; }
+ public bool IsOffScreen { get; }
+ internal Queue Queue { get; private set; }
+ internal Queue BackgroundQueue { get; private set; }
+ internal object BackgroundQueueLock { get; private set; }
+ internal object QueueLock { get; private set; }
+
+ internal MemoryAllocator MemoryAllocator { get; private set; }
+ internal CommandBufferPool CommandBufferPool { get; private set; }
+ internal DescriptorSetManager DescriptorSetManager { get; private set; }
+ internal PipelineLayoutCache PipelineLayoutCache { get; private set; }
+ internal BackgroundResources BackgroundResources { get; private set; }
+
+ internal BufferManager BufferManager { get; private set; }
+
+ internal HashSet<ShaderCollection> Shaders { get; }
+ internal HashSet<ITexture> Textures { get; }
+ internal HashSet<SamplerHolder> Samplers { get; }
+
+ private Counters _counters;
+ private SyncManager _syncManager;
+
+ private PipelineFull _pipeline;
+ private DebugReportCallbackEXT _debugReportCallback;
+
+ internal HelperShader HelperShader { get; private set; }
+ internal PipelineFull PipelineInternal => _pipeline;
+
+ public IPipeline Pipeline => _pipeline;
+
+ public IWindow Window => _window;
+
+ private readonly Func<Instance, Vk, SurfaceKHR> _getSurface;
+ private readonly Func<string[]> _getRequiredExtensions;
+ private readonly string _preferredGpuId;
+
+ internal Vendor Vendor { get; private set; }
+ internal bool IsAmdWindows { get; private set; }
+ internal bool IsIntelWindows { get; private set; }
+ internal bool IsAmdGcn { get; private set; }
+ public string GpuVendor { get; private set; }
+ public string GpuRenderer { get; private set; }
+ public string GpuVersion { get; private set; }
+
+ public bool PreferThreading => true;
+
+ public event EventHandler<ScreenCaptureImageInfo> ScreenCaptured;
+
+ public VulkanRenderer(Func<Instance, Vk, SurfaceKHR> surfaceFunc, Func<string[]> requiredExtensionsFunc, string preferredGpuId)
+ {
+ _getSurface = surfaceFunc;
+ _getRequiredExtensions = requiredExtensionsFunc;
+ _preferredGpuId = preferredGpuId;
+ Shaders = new HashSet<ShaderCollection>();
+ Textures = new HashSet<ITexture>();
+ Samplers = new HashSet<SamplerHolder>();
+ }
+
+ public VulkanRenderer(Instance instance, Device device, PhysicalDevice physicalDevice, Queue queue, uint queueFamilyIndex, object lockObject)
+ {
+ _instance = instance;
+ _physicalDevice = physicalDevice;
+ _device = device;
+ _queueFamilyIndex = queueFamilyIndex;
+
+ Queue = queue;
+ QueueLock = lockObject;
+
+ IsOffScreen = true;
+ Shaders = new HashSet<ShaderCollection>();
+ Textures = new HashSet<ITexture>();
+ Samplers = new HashSet<SamplerHolder>();
+ }
+
+ private unsafe void LoadFeatures(string[] supportedExtensions, uint maxQueueCount, uint queueFamilyIndex)
+ {
+ FormatCapabilities = new FormatCapabilities(Api, _physicalDevice);
+
+ var supportedFeatures = Api.GetPhysicalDeviceFeature(_physicalDevice);
+
+ if (Api.TryGetDeviceExtension(_instance, _device, out ExtConditionalRendering conditionalRenderingApi))
+ {
+ ConditionalRenderingApi = conditionalRenderingApi;
+ }
+
+ if (Api.TryGetDeviceExtension(_instance, _device, out ExtExtendedDynamicState extendedDynamicStateApi))
+ {
+ ExtendedDynamicStateApi = extendedDynamicStateApi;
+ }
+
+ if (Api.TryGetDeviceExtension(_instance, _device, out KhrPushDescriptor pushDescriptorApi))
+ {
+ PushDescriptorApi = pushDescriptorApi;
+ }
+
+ if (Api.TryGetDeviceExtension(_instance, _device, out ExtTransformFeedback transformFeedbackApi))
+ {
+ TransformFeedbackApi = transformFeedbackApi;
+ }
+
+ if (Api.TryGetDeviceExtension(_instance, _device, out KhrDrawIndirectCount drawIndirectCountApi))
+ {
+ DrawIndirectCountApi = drawIndirectCountApi;
+ }
+
+ if (maxQueueCount >= 2)
+ {
+ Api.GetDeviceQueue(_device, queueFamilyIndex, 1, out var backgroundQueue);
+ BackgroundQueue = backgroundQueue;
+ BackgroundQueueLock = new object();
+ }
+
+ PhysicalDeviceProperties2 properties2 = new PhysicalDeviceProperties2()
+ {
+ SType = StructureType.PhysicalDeviceProperties2
+ };
+
+ PhysicalDeviceSubgroupSizeControlPropertiesEXT propertiesSubgroupSizeControl = new PhysicalDeviceSubgroupSizeControlPropertiesEXT()
+ {
+ SType = StructureType.PhysicalDeviceSubgroupSizeControlPropertiesExt
+ };
+
+ if (Capabilities.SupportsSubgroupSizeControl)
+ {
+ properties2.PNext = &propertiesSubgroupSizeControl;
+ }
+
+ bool supportsTransformFeedback = supportedExtensions.Contains(ExtTransformFeedback.ExtensionName);
+
+ PhysicalDeviceTransformFeedbackPropertiesEXT propertiesTransformFeedback = new PhysicalDeviceTransformFeedbackPropertiesEXT()
+ {
+ SType = StructureType.PhysicalDeviceTransformFeedbackPropertiesExt
+ };
+
+ if (supportsTransformFeedback)
+ {
+ propertiesTransformFeedback.PNext = properties2.PNext;
+ properties2.PNext = &propertiesTransformFeedback;
+ }
+
+ Api.GetPhysicalDeviceProperties2(_physicalDevice, &properties2);
+
+ PhysicalDeviceFeatures2 features2 = new PhysicalDeviceFeatures2()
+ {
+ SType = StructureType.PhysicalDeviceFeatures2
+ };
+
+ PhysicalDeviceRobustness2FeaturesEXT featuresRobustness2 = new PhysicalDeviceRobustness2FeaturesEXT()
+ {
+ SType = StructureType.PhysicalDeviceRobustness2FeaturesExt
+ };
+
+ if (supportedExtensions.Contains("VK_EXT_robustness2"))
+ {
+ features2.PNext = &featuresRobustness2;
+ }
+
+ Api.GetPhysicalDeviceFeatures2(_physicalDevice, &features2);
+
+ Capabilities = new HardwareCapabilities(
+ supportedExtensions.Contains("VK_EXT_index_type_uint8"),
+ supportedExtensions.Contains("VK_EXT_custom_border_color"),
+ supportedExtensions.Contains(KhrDrawIndirectCount.ExtensionName),
+ supportedExtensions.Contains("VK_EXT_fragment_shader_interlock"),
+ supportedExtensions.Contains("VK_NV_geometry_shader_passthrough"),
+ supportedExtensions.Contains("VK_EXT_subgroup_size_control"),
+ supportedExtensions.Contains(ExtConditionalRendering.ExtensionName),
+ supportedExtensions.Contains(ExtExtendedDynamicState.ExtensionName),
+ features2.Features.MultiViewport,
+ featuresRobustness2.NullDescriptor,
+ supportedExtensions.Contains(KhrPushDescriptor.ExtensionName),
+ supportsTransformFeedback,
+ propertiesTransformFeedback.TransformFeedbackQueries,
+ supportedFeatures.GeometryShader,
+ propertiesSubgroupSizeControl.MinSubgroupSize,
+ propertiesSubgroupSizeControl.MaxSubgroupSize,
+ propertiesSubgroupSizeControl.RequiredSubgroupSizeStages);
+
+ ref var properties = ref properties2.Properties;
+
+ MemoryAllocator = new MemoryAllocator(Api, _device, properties.Limits.MaxMemoryAllocationCount);
+
+ CommandBufferPool = VulkanInitialization.CreateCommandBufferPool(Api, _device, Queue, QueueLock, queueFamilyIndex);
+
+ DescriptorSetManager = new DescriptorSetManager(_device);
+
+ PipelineLayoutCache = new PipelineLayoutCache();
+
+ BackgroundResources = new BackgroundResources(this, _device);
+
+ BufferManager = new BufferManager(this, _physicalDevice, _device);
+
+ _syncManager = new SyncManager(this, _device);
+ _pipeline = new PipelineFull(this, _device);
+ _pipeline.Initialize();
+
+ HelperShader = new HelperShader(this, _device);
+
+ _counters = new Counters(this, _device, _pipeline);
+ }
+
+ private unsafe void SetupContext(GraphicsDebugLevel logLevel)
+ {
+ var api = Vk.GetApi();
+
+ Api = api;
+
+ _instance = VulkanInitialization.CreateInstance(api, logLevel, _getRequiredExtensions(), out ExtDebugReport debugReport, out _debugReportCallback);
+
+ DebugReportApi = debugReport;
+
+ if (api.TryGetInstanceExtension(_instance, out KhrSurface surfaceApi))
+ {
+ SurfaceApi = surfaceApi;
+ }
+
+ _surface = _getSurface(_instance, api);
+ _physicalDevice = VulkanInitialization.FindSuitablePhysicalDevice(api, _instance, _surface, _preferredGpuId);
+
+ var queueFamilyIndex = VulkanInitialization.FindSuitableQueueFamily(api, _physicalDevice, _surface, out uint maxQueueCount);
+ var supportedExtensions = VulkanInitialization.GetSupportedExtensions(api, _physicalDevice);
+
+ _device = VulkanInitialization.CreateDevice(api, _physicalDevice, queueFamilyIndex, supportedExtensions, maxQueueCount);
+
+ if (api.TryGetDeviceExtension(_instance, _device, out KhrSwapchain swapchainApi))
+ {
+ SwapchainApi = swapchainApi;
+ }
+
+ api.GetDeviceQueue(_device, queueFamilyIndex, 0, out var queue);
+ Queue = queue;
+ QueueLock = new object();
+
+ LoadFeatures(supportedExtensions, maxQueueCount, queueFamilyIndex);
+
+ _window = new Window(this, _surface, _physicalDevice, _device);
+ }
+
+ private unsafe void SetupOffScreenContext(GraphicsDebugLevel logLevel)
+ {
+ var api = Vk.GetApi();
+
+ Api = api;
+
+ VulkanInitialization.CreateDebugCallbacks(api, logLevel, _instance, out var debugReport, out _debugReportCallback);
+
+ DebugReportApi = debugReport;
+
+ var supportedExtensions = VulkanInitialization.GetSupportedExtensions(api, _physicalDevice);
+
+ uint propertiesCount;
+
+ api.GetPhysicalDeviceQueueFamilyProperties(_physicalDevice, &propertiesCount, null);
+
+ QueueFamilyProperties[] queueFamilyProperties = new QueueFamilyProperties[propertiesCount];
+
+ fixed (QueueFamilyProperties* pProperties = queueFamilyProperties)
+ {
+ api.GetPhysicalDeviceQueueFamilyProperties(_physicalDevice, &propertiesCount, pProperties);
+ }
+
+ LoadFeatures(supportedExtensions, queueFamilyProperties[0].QueueCount, _queueFamilyIndex);
+
+ _window = new ImageWindow(this, _physicalDevice, _device);
+ }
+
+ public BufferHandle CreateBuffer(int size)
+ {
+ return BufferManager.CreateWithHandle(this, size, false);
+ }
+
+ public IProgram CreateProgram(ShaderSource[] sources, ShaderInfo info)
+ {
+ bool isCompute = sources.Length == 1 && sources[0].Stage == ShaderStage.Compute;
+
+ if (info.State.HasValue || isCompute)
+ {
+ return new ShaderCollection(this, _device, sources, info.State ?? default, info.FromCache);
+ }
+ else
+ {
+ return new ShaderCollection(this, _device, sources);
+ }
+ }
+
+ internal ShaderCollection CreateProgramWithMinimalLayout(ShaderSource[] sources)
+ {
+ return new ShaderCollection(this, _device, sources, isMinimal: true);
+ }
+
+ public ISampler CreateSampler(GAL.SamplerCreateInfo info)
+ {
+ return new SamplerHolder(this, _device, info);
+ }
+
+ public ITexture CreateTexture(TextureCreateInfo info, float scale)
+ {
+ if (info.Target == Target.TextureBuffer)
+ {
+ return new TextureBuffer(this, info, scale);
+ }
+
+ return CreateTextureView(info, scale);
+ }
+
+ internal TextureView CreateTextureView(TextureCreateInfo info, float scale)
+ {
+ // This should be disposed when all views are destroyed.
+ using var storage = CreateTextureStorage(info, scale);
+ return storage.CreateView(info, 0, 0);
+ }
+
+ internal TextureStorage CreateTextureStorage(TextureCreateInfo info, float scale)
+ {
+ return new TextureStorage(this, _physicalDevice, _device, info, scale);
+ }
+
+ public void DeleteBuffer(BufferHandle buffer)
+ {
+ BufferManager.Delete(buffer);
+ }
+
+ internal void FlushAllCommands()
+ {
+ _pipeline?.FlushCommandsImpl();
+ }
+
+ public ReadOnlySpan<byte> GetBufferData(BufferHandle buffer, int offset, int size)
+ {
+ return BufferManager.GetData(buffer, offset, size);
+ }
+
+ public Capabilities GetCapabilities()
+ {
+ FormatFeatureFlags compressedFormatFeatureFlags =
+ FormatFeatureFlags.FormatFeatureSampledImageBit |
+ FormatFeatureFlags.FormatFeatureSampledImageFilterLinearBit |
+ FormatFeatureFlags.FormatFeatureBlitSrcBit |
+ FormatFeatureFlags.FormatFeatureTransferSrcBit |
+ FormatFeatureFlags.FormatFeatureTransferDstBit;
+
+ bool supportsBc123CompressionFormat = FormatCapabilities.FormatsSupports(compressedFormatFeatureFlags,
+ GAL.Format.Bc1RgbaSrgb,
+ GAL.Format.Bc1RgbaUnorm,
+ GAL.Format.Bc2Srgb,
+ GAL.Format.Bc2Unorm,
+ GAL.Format.Bc3Srgb,
+ GAL.Format.Bc3Unorm);
+
+ bool supportsBc45CompressionFormat = FormatCapabilities.FormatsSupports(compressedFormatFeatureFlags,
+ GAL.Format.Bc4Snorm,
+ GAL.Format.Bc4Unorm,
+ GAL.Format.Bc5Snorm,
+ GAL.Format.Bc5Unorm);
+
+ bool supportsBc67CompressionFormat = FormatCapabilities.FormatsSupports(compressedFormatFeatureFlags,
+ GAL.Format.Bc6HSfloat,
+ GAL.Format.Bc6HUfloat,
+ GAL.Format.Bc7Srgb,
+ GAL.Format.Bc7Unorm);
+
+ Api.GetPhysicalDeviceFeatures(_physicalDevice, out var features);
+ Api.GetPhysicalDeviceProperties(_physicalDevice, out var properties);
+
+ var limits = properties.Limits;
+
+ return new Capabilities(
+ api: TargetApi.Vulkan,
+ GpuVendor,
+ hasFrontFacingBug: IsIntelWindows,
+ hasVectorIndexingBug: Vendor == Vendor.Qualcomm,
+ supportsAstcCompression: features.TextureCompressionAstcLdr,
+ supportsBc123Compression: supportsBc123CompressionFormat,
+ supportsBc45Compression: supportsBc45CompressionFormat,
+ supportsBc67Compression: supportsBc67CompressionFormat,
+ supports3DTextureCompression: true,
+ supportsBgraFormat: true,
+ supportsR4G4Format: false,
+ supportsFragmentShaderInterlock: Capabilities.SupportsFragmentShaderInterlock,
+ supportsFragmentShaderOrderingIntel: false,
+ supportsGeometryShaderPassthrough: Capabilities.SupportsGeometryShaderPassthrough,
+ supportsImageLoadFormatted: features.ShaderStorageImageReadWithoutFormat,
+ supportsMismatchingViewFormat: true,
+ supportsCubemapView: !IsAmdGcn,
+ supportsNonConstantTextureOffset: false,
+ supportsShaderBallot: false,
+ supportsTextureShadowLod: false,
+ supportsViewportSwizzle: false,
+ supportsIndirectParameters: Capabilities.SupportsIndirectParameters,
+ maximumUniformBuffersPerStage: Constants.MaxUniformBuffersPerStage,
+ maximumStorageBuffersPerStage: Constants.MaxStorageBuffersPerStage,
+ maximumTexturesPerStage: Constants.MaxTexturesPerStage,
+ maximumImagesPerStage: Constants.MaxImagesPerStage,
+ maximumComputeSharedMemorySize: (int)limits.MaxComputeSharedMemorySize,
+ maximumSupportedAnisotropy: (int)limits.MaxSamplerAnisotropy,
+ storageBufferOffsetAlignment: (int)limits.MinStorageBufferOffsetAlignment);
+ }
+
+ public HardwareInfo GetHardwareInfo()
+ {
+ return new HardwareInfo(GpuVendor, GpuRenderer);
+ }
+
+ public static DeviceInfo[] GetPhysicalDevices()
+ {
+ try
+ {
+ return VulkanInitialization.GetSuitablePhysicalDevices(Vk.GetApi());
+ }
+ catch (Exception)
+ {
+ // If we got an exception here, Vulkan is most likely not supported.
+ return Array.Empty<DeviceInfo>();
+ }
+ }
+
+ private static string ParseStandardVulkanVersion(uint version)
+ {
+ return $"{version >> 22}.{(version >> 12) & 0x3FF}.{version & 0xFFF}";
+ }
+
+ private static string ParseDriverVersion(ref PhysicalDeviceProperties properties)
+ {
+ uint driverVersionRaw = properties.DriverVersion;
+
+ // NVIDIA differ from the standard here and uses a different format.
+ if (properties.VendorID == 0x10DE)
+ {
+ return $"{(driverVersionRaw >> 22) & 0x3FF}.{(driverVersionRaw >> 14) & 0xFF}.{(driverVersionRaw >> 6) & 0xFF}.{driverVersionRaw & 0x3F}";
+ }
+ else
+ {
+ return ParseStandardVulkanVersion(driverVersionRaw);
+ }
+ }
+
+ private unsafe void PrintGpuInformation()
+ {
+ Api.GetPhysicalDeviceProperties(_physicalDevice, out var properties);
+
+ string vendorName = VendorUtils.GetNameFromId(properties.VendorID);
+
+ Vendor = VendorUtils.FromId(properties.VendorID);
+
+ IsAmdWindows = Vendor == Vendor.Amd && RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+ IsIntelWindows = Vendor == Vendor.Intel && RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
+ GpuVendor = vendorName;
+ GpuRenderer = Marshal.PtrToStringAnsi((IntPtr)properties.DeviceName);
+ GpuVersion = $"Vulkan v{ParseStandardVulkanVersion(properties.ApiVersion)}, Driver v{ParseDriverVersion(ref properties)}";
+
+ IsAmdGcn = Vendor == Vendor.Amd && VendorUtils.AmdGcnRegex.IsMatch(GpuRenderer);
+
+ Logger.Notice.Print(LogClass.Gpu, $"{GpuVendor} {GpuRenderer} ({GpuVersion})");
+ }
+
+ public void Initialize(GraphicsDebugLevel logLevel)
+ {
+ if (IsOffScreen)
+ {
+ SetupOffScreenContext(logLevel);
+ }
+ else
+ {
+ SetupContext(logLevel);
+ }
+
+ PrintGpuInformation();
+ }
+
+ public void PreFrame()
+ {
+ _syncManager.Cleanup();
+ }
+
+ public ICounterEvent ReportCounter(CounterType type, EventHandler<ulong> resultHandler, bool hostReserved)
+ {
+ return _counters.QueueReport(type, resultHandler, hostReserved);
+ }
+
+ public void ResetCounter(CounterType type)
+ {
+ _counters.QueueReset(type);
+ }
+
+ public void SetBufferData(BufferHandle buffer, int offset, ReadOnlySpan<byte> data)
+ {
+ BufferManager.SetData(buffer, offset, data, _pipeline.CurrentCommandBuffer, _pipeline.EndRenderPass);
+ }
+
+ public void UpdateCounters()
+ {
+ _counters.Update();
+ }
+
+ public void BackgroundContextAction(Action action, bool alwaysBackground = false)
+ {
+ action();
+ }
+
+ public void CreateSync(ulong id)
+ {
+ _syncManager.Create(id);
+ }
+
+ public IProgram LoadProgramBinary(byte[] programBinary, bool isFragment, ShaderInfo info)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void WaitSync(ulong id)
+ {
+ _syncManager.Wait(id);
+ }
+
+ public void Screenshot()
+ {
+ _window.ScreenCaptureRequested = true;
+ }
+
+ public void OnScreenCaptured(ScreenCaptureImageInfo bitmap)
+ {
+ ScreenCaptured?.Invoke(this, bitmap);
+ }
+
+ public unsafe void Dispose()
+ {
+ CommandBufferPool.Dispose();
+ BackgroundResources.Dispose();
+ _counters.Dispose();
+ _window.Dispose();
+ HelperShader.Dispose();
+ _pipeline.Dispose();
+ BufferManager.Dispose();
+ DescriptorSetManager.Dispose();
+ PipelineLayoutCache.Dispose();
+
+ MemoryAllocator.Dispose();
+
+ if (_debugReportCallback.Handle != 0)
+ {
+ DebugReportApi.DestroyDebugReportCallback(_instance, _debugReportCallback, null);
+ }
+
+ foreach (var shader in Shaders)
+ {
+ shader.Dispose();
+ }
+
+ foreach (var texture in Textures)
+ {
+ texture.Release();
+ }
+
+ foreach (var sampler in Samplers)
+ {
+ sampler.Dispose();
+ }
+
+ if (!IsOffScreen)
+ {
+ SurfaceApi.DestroySurface(_instance, _surface, null);
+
+ Api.DestroyDevice(_device, null);
+
+ // Last step destroy the instance
+ Api.DestroyInstance(_instance, null);
+ }
+ }
+ }
+}