Merge 08ae5010d3 into 7d158acc3b

Do not try to create a texture pool if shader does not use textures (#7379 )
Revert changes to ConvertToVkFormat
2024-12-16 15:36:34 +00:00 · 2024-09-30 23:02:06 +03:00 · 2024-09-30 11:41:07 -03:00 · 2024-09-17 20:13:33 -07:00 · 2024-09-01 22:04:41 -07:00 · 2024-09-01 22:01:58 -07:00
4 changed files with 26 additions and 11 deletions
--- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
@ -743,7 +743,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
                constantBufferUsePerStageMask &= ~(1 << index);
            }

-            if (checkTextures)
+            if (checkTextures && _allTextures.Length > 0)
            {
                TexturePool pool = channel.TextureManager.GetTexturePool(poolState.TexturePoolGpuVa, poolState.TexturePoolMaximumId);

--- a/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
@ -29,11 +29,17 @@ namespace Ryujinx.Graphics.Vulkan
            int colorCount = 0;
            int maxColorAttachmentIndex = -1;

+            bool isNotMsOrSupportsStorage = gd.Capabilities.SupportsShaderStorageImageMultisample ||
+                 !state.DepthStencilFormat.IsImageCompatible();
+
            for (int i = 0; i < state.AttachmentEnable.Length; i++)
            {
                if (state.AttachmentEnable[i])
                {
-                    attachmentFormats[attachmentCount] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i]);
+                    bool isNotMsOrSupportsStorageAttachments = gd.Capabilities.SupportsShaderStorageImageMultisample ||
+                         !state.AttachmentFormats[i].IsImageCompatible();
+
+                    attachmentFormats[attachmentCount] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i], isNotMsOrSupportsStorageAttachments);

                    attachmentIndices[attachmentCount++] = i;
                    colorCount++;
@ -43,7 +49,7 @@ namespace Ryujinx.Graphics.Vulkan

            if (state.DepthStencilEnable)
            {
-                attachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat);
+                attachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat, isNotMsOrSupportsStorage);
            }

            if (attachmentCount != 0)
@ -296,7 +302,10 @@ namespace Ryujinx.Graphics.Vulkan
            {
                if (state.AttachmentEnable[i])
                {
-                    pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i]);
+                    bool isNotMsOrSupportsStorage = gd.Capabilities.SupportsShaderStorageImageMultisample ||
+                         !state.AttachmentFormats[i].IsImageCompatible();
+
+                    pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.AttachmentFormats[i], isNotMsOrSupportsStorage);
                    maxColorAttachmentIndex = i;

                    if (state.AttachmentFormats[i].IsInteger())
@ -310,7 +319,10 @@ namespace Ryujinx.Graphics.Vulkan

            if (state.DepthStencilEnable)
            {
-                pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat);
+                bool isNotMsOrSupportsStorage = !state.DepthStencilFormat.IsImageCompatible() ||
+                     gd.Capabilities.SupportsShaderStorageImageMultisample;
+
+                pipeline.Internal.AttachmentFormats[attachmentCount++] = gd.FormatCapabilities.ConvertToVkFormat(state.DepthStencilFormat, isNotMsOrSupportsStorage);
            }

            pipeline.ColorBlendAttachmentStateCount = (uint)(maxColorAttachmentIndex + 1);
--- a/src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
+++ b/src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
@ -77,6 +77,8 @@ namespace Ryujinx.Graphics.Vulkan
            _device = device;
            _info = info;

+            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
+
            var format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format);
            var levels = (uint)info.Levels;
            var layers = (uint)info.GetLayers();
@ -91,7 +93,7 @@ namespace Ryujinx.Graphics.Vulkan

            var sampleCountFlags = ConvertToSampleCountFlags(gd.Capabilities.SupportedSampleCounts, (uint)info.Samples);

-            var usage = GetImageUsage(info.Format, info.Target, gd.Capabilities);
+            var usage = GetImageUsage(info.Format, gd.Capabilities, isMsImageStorageSupported, true);

            var flags = ImageCreateFlags.CreateMutableFormatBit | ImageCreateFlags.CreateExtendedUsageBit;

@ -305,7 +307,7 @@ namespace Ryujinx.Graphics.Vulkan
            }
        }

-        public static ImageUsageFlags GetImageUsage(Format format, Target target, in HardwareCapabilities capabilities)
+        public static ImageUsageFlags GetImageUsage(Format format, in HardwareCapabilities capabilities, bool isMsImageStorageSupported, bool extendedUsage)
        {
            var usage = DefaultUsageFlags;

@ -318,9 +320,7 @@ namespace Ryujinx.Graphics.Vulkan
                usage |= ImageUsageFlags.ColorAttachmentBit;
            }

-            bool supportsMsStorage = capabilities.SupportsShaderStorageImageMultisample;
-
-            if (format.IsImageCompatible() && (supportsMsStorage || !target.IsMultisample()))
+            if ((format.IsImageCompatible() && isMsImageStorageSupported) || extendedUsage)
            {
                usage |= ImageUsageFlags.StorageBit;
            }
--- a/src/Ryujinx.Graphics.Vulkan/TextureView.cs
+++ b/src/Ryujinx.Graphics.Vulkan/TextureView.cs
@ -61,8 +61,11 @@ namespace Ryujinx.Graphics.Vulkan

            gd.Textures.Add(this);

+            bool isMsImageStorageSupported = gd.Capabilities.SupportsShaderStorageImageMultisample || !info.Target.IsMultisample();
+
            var format = _gd.FormatCapabilities.ConvertToVkFormat(info.Format);
-            var usage = TextureStorage.GetImageUsage(info.Format, info.Target, gd.Capabilities);
+            var usage = TextureStorage.GetImageUsage(info.Format, gd.Capabilities, isMsImageStorageSupported, false);
+
            var levels = (uint)info.Levels;
            var layers = (uint)info.GetLayers();
Author	SHA1	Message	Date
sunshineinabox	c8e24ca49d	Merge `08ae5010d3` into `7d158acc3b`	2024-09-30 23:02:06 +03:00
gdkchan	7d158acc3b	Do not try to create a texture pool if shader does not use textures (#7379 )	2024-09-30 11:41:07 -03:00
sunshineinabox	08ae5010d3	Revert changes to ConvertToVkFormat	2024-09-17 20:13:33 -07:00
sunshineinabox	89a70f2aa3	Rename variable and resolve a missed change	2024-09-01 22:04:41 -07:00
sunshineinabox	9916d2fb7c	Merge branch 'master' into ResolveExtendedImageViewUsage	2024-09-01 22:01:58 -07:00
sunshineinabox	53565831e8	Renamed variable to be more descriptive	2024-07-22 18:14:10 -07:00
sunshineinabox	bc757307d2	Resolve whitespace	2024-07-21 18:36:18 -07:00
sunshineinabox	36294a60b3	Renamed some variables for code review	2024-07-21 18:33:09 -07:00
sunshineinabox	87105b0ad1	Request Storage image bit feature flag only if its required	2024-07-20 18:00:33 -07:00
sunshineinabox	8bf7153794	This should allow resolution of pending validation error by creating an image with extended usage flags, but narrowed usage for image views.	2024-07-17 23:26:52 -07:00