mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve shader sending method to GAL, use a memory interface instead of reading a fixed array size and sending every time

Browse source
This commit is contained in:
gdkchan 2018-05-22 22:43:31 -03:00
parent 84996ccd36
commit 79e0070363
12 changed files with 72 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Graphics/Gal/Shader/GlslDecompiler.cs
View file

@ -89,9 +89,9 @@ namespace Ryujinx.Graphics.Gal.Shader
};
}
public GlslProgram Decompile(int[] Code, GalShaderType ShaderType)
public GlslProgram Decompile(IGalMemory Memory, long Position, GalShaderType ShaderType)
{
ShaderIrBlock Block = ShaderDecoder.DecodeBasicBlock(Code, 0);
ShaderIrBlock Block = ShaderDecoder.DecodeBasicBlock(Memory, Position);
ShaderIrNode[] Nodes = Block.GetNodes();

2
Ryujinx.Graphics/Gal/Shader/ShaderDecodeFlow.cs
View file

@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Gal.Shader
throw new NotImplementedException();
}
int Target = ((int)(OpCode >> 20) << 8) >> 8;
long Target = ((int)(OpCode >> 20) << 8) >> 8;
Target += Block.Position + 8;

22
Ryujinx.Graphics/Gal/Shader/ShaderDecoder.cs
View file

@ -4,28 +4,28 @@ namespace Ryujinx.Graphics.Gal.Shader
{
private const bool AddDbgComments = true;
public static ShaderIrBlock DecodeBasicBlock(int[] Code, int Offset)
public static ShaderIrBlock DecodeBasicBlock(IGalMemory Memory, long Position)
{
ShaderIrBlock Block = new ShaderIrBlock();
while (Offset + 2 <= Code.Length)
while (true)
{
int InstPos = Offset * 4;
Block.Position = Position;
Block.Position = InstPos;
Block.MarkLabel(InstPos);
Block.MarkLabel(Position);
//Ignore scheduling instructions, which are written every 32 bytes.
if ((Offset & 7) == 0)
if ((Position & 0x1f) == 0)
{
Offset += 2;
Position += 8;
continue;
}
uint Word0 = (uint)Code[Offset++];
uint Word1 = (uint)Code[Offset++];
uint Word0 = (uint)Memory.ReadInt32(Position + 0);
uint Word1 = (uint)Memory.ReadInt32(Position + 4);
Position += 8;
long OpCode = Word0 | (long)Word1 << 32;
@ -33,7 +33,7 @@ namespace Ryujinx.Graphics.Gal.Shader
if (AddDbgComments)
{
string DbgOpCode = $"0x{InstPos:x8}: 0x{OpCode:x16} ";
string DbgOpCode = $"0x{Position:x16}: 0x{OpCode:x16} ";
Block.AddNode(new ShaderIrCmnt(DbgOpCode + (Decode?.Method.Name ?? "???")));
}

10
Ryujinx.Graphics/Gal/Shader/ShaderIrBlock.cs
View file

@ -6,15 +6,15 @@ namespace Ryujinx.Graphics.Gal.Shader
{
private List<ShaderIrNode> Nodes;
private Dictionary<int, ShaderIrLabel> LabelsToInsert;
private Dictionary<long, ShaderIrLabel> LabelsToInsert;
public int Position;
public long Position;
public ShaderIrBlock()
{
Nodes = new List<ShaderIrNode>();
LabelsToInsert = new Dictionary<int, ShaderIrLabel>();
LabelsToInsert = new Dictionary<long, ShaderIrLabel>();
}
public void AddNode(ShaderIrNode Node)
@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gal.Shader
Nodes.Add(Node);
}
public ShaderIrLabel GetLabel(int Position)
public ShaderIrLabel GetLabel(long Position)
{
if (LabelsToInsert.TryGetValue(Position, out ShaderIrLabel Label))
{
@ -36,7 +36,7 @@ namespace Ryujinx.Graphics.Gal.Shader
return Label;
}
public void MarkLabel(int Position)
public void MarkLabel(long Position)
{
if (LabelsToInsert.TryGetValue(Position, out ShaderIrLabel Label))
{