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

Address feedback

Browse source
This commit is contained in:
ReinUsesLisp 2018-08-31 21:48:33 -03:00
commit 75d7f0b327
5 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Graphics/Gal/IGalShader.cs
View file

@ -4,7 +4,9 @@ namespace Ryujinx.Graphics.Gal
{ {
public interface IGalShader public interface IGalShader
{ {
void Create(long Key, byte[] BinaryA, byte[] BinaryB, GalShaderType Type); void Create(long KeyA, long KeyB, byte[] BinaryA, byte[] BinaryB, GalShaderType Type);
bool TryGetSize(long Key, out long Size);
IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key); IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key);
IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key); IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key);

28
Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs
View file

@ -19,6 +19,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
private Dictionary<long, OGLShaderStage> TopStages; private Dictionary<long, OGLShaderStage> TopStages;
private Dictionary<long, long> TopStageSizes;
private Dictionary<OGLShaderProgram, int> Programs; private Dictionary<OGLShaderProgram, int> Programs;
public int CurrentProgramHandle { get; private set; } public int CurrentProgramHandle { get; private set; }
@ -35,15 +37,20 @@ namespace Ryujinx.Graphics.Gal.OpenGL
TopStages = new Dictionary<long, OGLShaderStage>(); TopStages = new Dictionary<long, OGLShaderStage>();
TopStageSizes = new Dictionary<long, long>();
Programs = new Dictionary<OGLShaderProgram, int>(); Programs = new Dictionary<OGLShaderProgram, int>();
} }
public void Create( public void Create(
long Key, long KeyA,
long KeyB,
byte[] BinaryA, byte[] BinaryA,
byte[] BinaryB, byte[] BinaryB,
GalShaderType Type) GalShaderType Type)
{ {
long Key = KeyB;
if (Stages.TryGetValue(Key, out List<OGLShaderStage> Cache)) if (Stages.TryGetValue(Key, out List<OGLShaderStage> Cache))
{ {
OGLShaderStage CachedStage = Cache.Find((OGLShaderStage Stage) => Stage.EqualsBinary(BinaryA, BinaryB)); OGLShaderStage CachedStage = Cache.Find((OGLShaderStage Stage) => Stage.EqualsBinary(BinaryA, BinaryB));
@ -91,6 +98,25 @@ namespace Ryujinx.Graphics.Gal.OpenGL
Cache.Add(NewStage); Cache.Add(NewStage);
TopStages[Key] = NewStage; TopStages[Key] = NewStage;
if (BinaryA != null)
{
TopStageSizes[KeyA] = BinaryA.Length;
}
TopStageSizes[KeyB] = BinaryB.Length;
}
public bool TryGetSize(long Key, out long Size)
{
if (TopStageSizes.TryGetValue(Key, out Size))
{
return true;
}
Size = 0;
return false;
} }
public IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key) public IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key)

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

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.Graphics.Gal.Shader namespace Ryujinx.Graphics.Gal.Shader
@ -138,7 +139,7 @@ namespace Ryujinx.Graphics.Gal.Shader
continue; continue;
} }
long OpCode = ReadQWord(Binary, Position); long OpCode = BitConverter.ToInt64(Binary, (int)Position);
Position += 8; Position += 8;
@ -199,18 +200,5 @@ namespace Ryujinx.Graphics.Gal.Shader
return Op.Inst != ShaderIrInst.Exit && return Op.Inst != ShaderIrInst.Exit &&
Op.Inst != ShaderIrInst.Bra; Op.Inst != ShaderIrInst.Bra;
} }
private static unsafe long ReadQWord(byte[] Bytes, long Position)
{
if (Position >= Bytes.Length)
{
throw new System.InvalidOperationException();
}
fixed (byte* Pointer = Bytes)
{
return *((long*)(Pointer + Position));
}
}
} }
} }

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

@ -61,11 +61,11 @@ namespace Ryujinx.Graphics.Gal.Shader
public unsafe ShaderHeader(byte[] Binary) public unsafe ShaderHeader(byte[] Binary)
{ {
uint CommonWord0 = ReadWord(Binary, 0); uint CommonWord0 = BitConverter.ToUInt32(Binary, 0);
uint CommonWord1 = ReadWord(Binary, 4); uint CommonWord1 = BitConverter.ToUInt32(Binary, 4);
uint CommonWord2 = ReadWord(Binary, 8); uint CommonWord2 = BitConverter.ToUInt32(Binary, 8);
uint CommonWord3 = ReadWord(Binary, 12); uint CommonWord3 = BitConverter.ToUInt32(Binary, 12);
uint CommonWord4 = ReadWord(Binary, 16); uint CommonWord4 = BitConverter.ToUInt32(Binary, 16);
SphType = ReadBits(CommonWord0, 0, 5); SphType = ReadBits(CommonWord0, 0, 5);
Version = ReadBits(CommonWord0, 5, 5); Version = ReadBits(CommonWord0, 5, 5);
@ -92,8 +92,8 @@ namespace Ryujinx.Graphics.Gal.Shader
StoreReqEnd = ReadBits(CommonWord4, 24, 8); StoreReqEnd = ReadBits(CommonWord4, 24, 8);
//Type 2 (fragment?) reading //Type 2 (fragment?) reading
uint Type2OmapTarget = ReadWord(Binary, 72); uint Type2OmapTarget = BitConverter.ToUInt32(Binary, 72);
uint Type2Omap = ReadWord(Binary, 76); uint Type2Omap = BitConverter.ToUInt32(Binary, 76);
OmapTargets = new OmapTarget[8]; OmapTargets = new OmapTarget[8];
@ -136,14 +136,6 @@ namespace Ryujinx.Graphics.Gal.Shader
} }
} }
private static unsafe uint ReadWord(byte[] Bytes, long Position)
{
fixed (byte* Pointer = Bytes)
{
return *((uint*)(Pointer + Position));
}
}
private static int ReadBits(uint Word, int Offset, int BitWidth) private static int ReadBits(uint Word, int Offset, int BitWidth)
{ {
uint Mask = (1u << BitWidth) - 1u; uint Mask = (1u << BitWidth) - 1u;

12
Ryujinx.HLE/Gpu/Engines/NvGpuEngine3d.cs
View file

@ -29,8 +29,6 @@ namespace Ryujinx.HLE.Gpu.Engines
private int CurrentInstance = 0; private int CurrentInstance = 0;
private Dictionary<long, long> ShadersSize;
public NvGpuEngine3d(NvGpu Gpu) public NvGpuEngine3d(NvGpu Gpu)
{ {
this.Gpu = Gpu; this.Gpu = Gpu;
@ -70,8 +68,6 @@ namespace Ryujinx.HLE.Gpu.Engines
{ {
UploadedKeys[i] = new List<long>(); UploadedKeys[i] = new List<long>();
} }
ShadersSize = new Dictionary<long, long>();
} }
public void CallMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry) public void CallMethod(NvGpuVmm Vmm, NvGpuPBEntry PBEntry)
@ -279,7 +275,7 @@ namespace Ryujinx.HLE.Gpu.Engines
byte[] BinaryA = ReadShaderBinary(Vmm, VpAPos); byte[] BinaryA = ReadShaderBinary(Vmm, VpAPos);
byte[] BinaryB = ReadShaderBinary(Vmm, VpBPos); byte[] BinaryB = ReadShaderBinary(Vmm, VpBPos);
Gpu.Renderer.Shader.Create(VpBPos, BinaryA, BinaryB, GalShaderType.Vertex); Gpu.Renderer.Shader.Create(VpAPos, VpBPos, BinaryA, BinaryB, GalShaderType.Vertex);
} }
Gpu.Renderer.Shader.Bind(VpBPos); Gpu.Renderer.Shader.Bind(VpBPos);
@ -312,7 +308,7 @@ namespace Ryujinx.HLE.Gpu.Engines
{ {
byte[] Binary = ReadShaderBinary(Vmm, Key); byte[] Binary = ReadShaderBinary(Vmm, Key);
Gpu.Renderer.Shader.Create(Key, null, Binary, Type); Gpu.Renderer.Shader.Create(0, Key, null, Binary, Type);
} }
Gpu.Renderer.Shader.Bind(Key); Gpu.Renderer.Shader.Bind(Key);
@ -892,7 +888,7 @@ namespace Ryujinx.HLE.Gpu.Engines
{ {
long Address = Vmm.GetPhysicalAddress(Key); long Address = Vmm.GetPhysicalAddress(Key);
if (ShadersSize.TryGetValue(Address, out long Size)) if (Gpu.Renderer.Shader.TryGetSize(Address, out long Size))
{ {
if (!QueryKeyUpload(Vmm, Address, Size, NvGpuBufferType.Shader)) if (!QueryKeyUpload(Vmm, Address, Size, NvGpuBufferType.Shader))
{ {
@ -909,8 +905,6 @@ namespace Ryujinx.HLE.Gpu.Engines
long Address = Vmm.GetPhysicalAddress(Key); long Address = Vmm.GetPhysicalAddress(Key);
ShadersSize[Address] = Size;
return Vmm.ReadBytes(Key, Size); return Vmm.ReadBytes(Key, Size);
} }