Merge 4fdc2bf3b0 into 6ce49a2dc7

Fixes cutscenes in Super Mario Sunshine

src/Ryujinx.Graphics.Metal/FormatTable.cs

@@ -72,7 +72,7 @@ namespace Ryujinx.Graphics.Metal
             Add(Format.D32FloatS8Uint, MTLPixelFormat.Depth32FloatStencil8);
             Add(Format.R8G8B8A8Srgb, MTLPixelFormat.RGBA8UnormsRGB);
             // Add(Format.R4G4Unorm,           MTLPixelFormat.R4G4Unorm);
-            // Add(Format.R4G4B4A4Unorm,       MTLPixelFormat.R4G4B4A4Unorm);
+            Add(Format.R4G4B4A4Unorm,       MTLPixelFormat.RGBA8Unorm);
             // Add(Format.R5G5B5X1Unorm,       MTLPixelFormat.R5G5B5X1Unorm);
             Add(Format.R5G5B5A1Unorm, MTLPixelFormat.BGR5A1Unorm);
             Add(Format.R5G6B5Unorm, MTLPixelFormat.B5G6R5Unorm);

src/Ryujinx.Graphics.Shader/CodeGen/Msl/Declarations.cs

@@ -1,4 +1,5 @@
 using Ryujinx.Common;
+using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.Shader.IntermediateRepresentation;
 using Ryujinx.Graphics.Shader.StructuredIr;
 using Ryujinx.Graphics.Shader.Translation;
@@ -308,7 +309,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
         {
             if (context.Definitions.IaIndexing)
             {
-                // Not handled
+                Logger.Warning?.PrintMsg(LogClass.Gpu, "Unhandled IA Indexing!");
             }
             else
             {
@@ -390,9 +391,9 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
 
         private static void DeclareOutputAttributes(CodeGenContext context, IEnumerable<IoDefinition> outputs)
         {
-            if (context.Definitions.IaIndexing)
+            if (context.Definitions.OaIndexing)
             {
-                // Not handled
+                Logger.Warning?.PrintMsg(LogClass.Gpu, "Unhandled OA Indexing!");
             }
             else
             {
@@ -415,7 +416,29 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
 
                     context.EnterScope();
 
-                    foreach (var ioDefinition in outputs.OrderBy(x => x.Location))
+                    outputs = outputs.OrderBy(x => x.Location);
+
+                    if (context.Definitions.Stage == ShaderStage.Fragment && context.Definitions.DualSourceBlend)
+                    {
+                        IoDefinition firstOutput = outputs.ElementAtOrDefault(0);
+                        IoDefinition secondOutput = outputs.ElementAtOrDefault(1);
+
+                        if (firstOutput.Location + 1 == secondOutput.Location)
+                        {
+                            var type1 = GetVarTypeName(context.Definitions.GetFragmentOutputColorType(firstOutput.Location));
+                            var type2 = GetVarTypeName(context.Definitions.GetFragmentOutputColorType(secondOutput.Location));
+
+                            var name1 = $"color{firstOutput.Location}";
+                            var name2 = $"color{secondOutput.Location}";
+
+                            context.AppendLine($"{type1} {name1} [[color({firstOutput.Location}, index(0)]]");
+                            context.AppendLine($"{type2} {name2} [[color({firstOutput.Location}, index(1)]]");
+
+                            outputs = outputs.Skip(2);
+                        }
+                    }
+
+                    foreach (var ioDefinition in outputs)
                     {
                         string type = ioDefinition.IoVariable switch
                         {

src/Ryujinx.Graphics.Shader/CodeGen/Msl/NumberFormatter.cs

@@ -76,7 +76,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                 return value.ToString(CultureInfo.InvariantCulture);
             }
 
-            return "0x" + value.ToString("X", CultureInfo.InvariantCulture);
+            return $"as_type<int>(0x{value.ToString("X", CultureInfo.InvariantCulture)})";
         }
 
         public static string FormatUint(uint value)
@@ -86,7 +86,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
                 return value.ToString(CultureInfo.InvariantCulture) + "u";
             }
 
-            return "0x" + value.ToString("X", CultureInfo.InvariantCulture) + "u";
+            return $"as_type<uint>(0x{value.ToString("X", CultureInfo.InvariantCulture)})";
         }
     }
 }

src/Ryujinx.Graphics.Vulkan/TextureView.cs

@@ -667,8 +667,36 @@ namespace Ryujinx.Graphics.Vulkan
 
             if (PrepareOutputBuffer(cbs, hostSize, buffer, out VkBuffer copyToBuffer, out BufferHolder tempCopyHolder))
             {
+                // No barrier necessary, as this is a temporary copy buffer.
                 offset = 0;
             }
+            else
+            {
+                BufferHolder.InsertBufferBarrier(
+                    _gd,
+                    cbs.CommandBuffer,
+                    copyToBuffer,
+                    BufferHolder.DefaultAccessFlags,
+                    AccessFlags.TransferWriteBit,
+                    PipelineStageFlags.AllCommandsBit,
+                    PipelineStageFlags.TransferBit,
+                    offset,
+                    outSize);
+            }
+
+            InsertImageBarrier(
+                _gd.Api,
+                cbs.CommandBuffer,
+                image,
+                TextureStorage.DefaultAccessMask,
+                AccessFlags.TransferReadBit,
+                PipelineStageFlags.AllCommandsBit,
+                PipelineStageFlags.TransferBit,
+                Info.Format.ConvertAspectFlags(),
+                FirstLayer + layer,
+                FirstLevel + level,
+                1,
+                1);
 
             CopyFromOrToBuffer(cbs.CommandBuffer, copyToBuffer, image, hostSize, true, layer, level, 1, 1, singleSlice: true, offset, stride);
 
@@ -677,6 +705,19 @@ namespace Ryujinx.Graphics.Vulkan
                 CopyDataToOutputBuffer(cbs, tempCopyHolder, autoBuffer, hostSize, range.Offset);
                 tempCopyHolder.Dispose();
             }
+            else
+            {
+                BufferHolder.InsertBufferBarrier(
+                    _gd,
+                    cbs.CommandBuffer,
+                    copyToBuffer,
+                    AccessFlags.TransferWriteBit,
+                    BufferHolder.DefaultAccessFlags,
+                    PipelineStageFlags.TransferBit,
+                    PipelineStageFlags.AllCommandsBit,
+                    offset,
+                    outSize);
+            }
         }
 
         private ReadOnlySpan<byte> GetData(CommandBufferPool cbp, PersistentFlushBuffer flushBuffer)

src/Ryujinx/UI/Models/TitleUpdateModel.cs

@@ -1,21 +1,20 @@
-using LibHac.Ns;
 using Ryujinx.Ava.Common.Locale;
 
 namespace Ryujinx.Ava.UI.Models
 {
     public class TitleUpdateModel
     {
-        public ApplicationControlProperty Control { get; }
+        public uint Version { get; }
         public string Path { get; }
+        public string Label { get; }
 
-        public string Label => LocaleManager.Instance.UpdateAndGetDynamicValue(
-            System.IO.Path.GetExtension(Path)?.ToLower() == ".xci" ? LocaleKeys.TitleBundledUpdateVersionLabel : LocaleKeys.TitleUpdateVersionLabel,
-            Control.DisplayVersionString.ToString()
-        );
-
-        public TitleUpdateModel(ApplicationControlProperty control, string path)
+        public TitleUpdateModel(uint version, string displayVersion, string path)
         {
-            Control = control;
+            Version = version;
+            Label = LocaleManager.Instance.UpdateAndGetDynamicValue(
+                System.IO.Path.GetExtension(path)?.ToLower() == ".xci" ? LocaleKeys.TitleBundledUpdateVersionLabel : LocaleKeys.TitleUpdateVersionLabel,
+                displayVersion
+            );
             Path = path;
         }
     }

src/Ryujinx/UI/ViewModels/TitleUpdateViewModel.cs

@@ -131,26 +131,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public void SortUpdates()
         {
-            var list = TitleUpdates.ToList();
-
-            list.Sort((first, second) =>
-            {
-                if (string.IsNullOrEmpty(first.Control.DisplayVersionString.ToString()))
-                {
-                    return -1;
-                }
-
-                if (string.IsNullOrEmpty(second.Control.DisplayVersionString.ToString()))
-                {
-                    return 1;
-                }
-
-                return Version.Parse(first.Control.DisplayVersionString.ToString()).CompareTo(Version.Parse(second.Control.DisplayVersionString.ToString())) * -1;
-            });
+            var sortedUpdates = TitleUpdates.OrderByDescending(update => update.Version);
 
             Views.Clear();
             Views.Add(new BaseModel());
-            Views.AddRange(list);
+            Views.AddRange(sortedUpdates);
 
             if (SelectedUpdate == null)
             {
@@ -204,7 +189,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                     controlNca.OpenFileSystem(NcaSectionType.Data, IntegrityCheckLevel.None).OpenFile(ref nacpFile.Ref, "/control.nacp".ToU8Span(), OpenMode.Read).ThrowIfFailure();
                     nacpFile.Get.Read(out _, 0, SpanHelpers.AsByteSpan(ref controlData), ReadOption.None).ThrowIfFailure();
 
-                    var update = new TitleUpdateModel(controlData, path);
+                    var displayVersion = controlData.DisplayVersionString.ToString();
+                    var update = new TitleUpdateModel(content.Version.Version, displayVersion, path);
+
                     TitleUpdates.Add(update);
 
                     if (selected)