Compare commits

...

3 commits

Author SHA1 Message Date
Isaac Marovitz
4fdc2bf3b0
Fix hex number type ambiguity
Fixes cutscenes in Super Mario Sunshine
2024-07-29 01:25:27 +01:00
Isaac Marovitz
1da00c2620
Use RGBA8Unorm for R4G4B4A4Unorm
Gets SM64 to boot
2024-07-29 01:02:59 +01:00
Isaac Marovitz
ba96e0d80e
Dual Source Blend Support in Shader
Fixes Super Mario Galaxy
2024-07-29 00:51:53 +01:00
3 changed files with 30 additions and 7 deletions

View file

@ -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);

View file

@ -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
{

View file

@ -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)})";
}
}
}