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

bring back inline updates for some state

Browse source
This commit is contained in:
Samuliak 2024-05-19 16:47:43 +02:00 committed by Isaac Marovitz
parent bb425bf640
commit d04e24c382
2 changed files with 81 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Ryujinx.Graphics.Metal/EncoderState.cs
View file

@ -10,20 +10,12 @@ namespace Ryujinx.Graphics.Metal
{ {
public bool Pipeline = false; public bool Pipeline = false;
public bool DepthStencil = false; public bool DepthStencil = false;
public bool CullMode = false;
public bool Winding = false;
public bool Viewport = false;
public bool Scissor = false;
public DirtyFlags() { } public DirtyFlags() { }
public void MarkAll() { public void MarkAll() {
Pipeline = true; Pipeline = true;
DepthStencil = true; DepthStencil = true;
CullMode = true;
Winding = true;
Viewport = true;
Scissor = true;
} }
} }

102
src/Ryujinx.Graphics.Metal/EncoderStateManager.cs
View file

@ -98,16 +98,10 @@ namespace Ryujinx.Graphics.Metal
var renderCommandEncoder = _pipeline.CommandBuffer.RenderCommandEncoder(renderPassDescriptor); var renderCommandEncoder = _pipeline.CommandBuffer.RenderCommandEncoder(renderPassDescriptor);
// Mark all state as dirty to ensure it is set on the encoder
_currentState.Dirty.MarkAll(); _currentState.Dirty.MarkAll();
return renderCommandEncoder; // Rebind all the state
}
public void RebindState(MTLRenderCommandEncoder renderCommandEncoder)
{
// TODO: only rebind the dirty state
SetPipelineState(renderCommandEncoder);
SetDepthStencilState(renderCommandEncoder);
SetDepthClamp(renderCommandEncoder); SetDepthClamp(renderCommandEncoder);
SetCullMode(renderCommandEncoder); SetCullMode(renderCommandEncoder);
SetFrontFace(renderCommandEncoder); SetFrontFace(renderCommandEncoder);
@ -119,6 +113,14 @@ namespace Ryujinx.Graphics.Metal
SetTextureAndSampler(renderCommandEncoder, ShaderStage.Vertex, _currentState.VertexTextures, _currentState.VertexSamplers); SetTextureAndSampler(renderCommandEncoder, ShaderStage.Vertex, _currentState.VertexTextures, _currentState.VertexSamplers);
SetTextureAndSampler(renderCommandEncoder, ShaderStage.Fragment, _currentState.FragmentTextures, _currentState.FragmentSamplers); SetTextureAndSampler(renderCommandEncoder, ShaderStage.Fragment, _currentState.FragmentTextures, _currentState.FragmentSamplers);
return renderCommandEncoder;
}
public void RebindState(MTLRenderCommandEncoder renderCommandEncoder)
{
SetPipelineState(renderCommandEncoder);
SetDepthStencilState(renderCommandEncoder);
_currentState.Dirty = new(); _currentState.Dirty = new();
} }
@ -355,6 +357,13 @@ namespace Ryujinx.Graphics.Metal
public void UpdateDepthClamp(bool clamp) public void UpdateDepthClamp(bool clamp)
{ {
_currentState.DepthClipMode = clamp ? MTLDepthClipMode.Clamp : MTLDepthClipMode.Clip; _currentState.DepthClipMode = clamp ? MTLDepthClipMode.Clamp : MTLDepthClipMode.Clip;
// Inline update
if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetDepthClamp(renderCommandEncoder);
}
} }
// Inlineable // Inlineable
@ -382,8 +391,12 @@ namespace Ryujinx.Graphics.Metal
}; };
} }
// Mark dirty // Inline update
_currentState.Dirty.Scissor = true; if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetScissors(renderCommandEncoder);
}
} }
// Inlineable // Inlineable
@ -410,13 +423,27 @@ namespace Ryujinx.Graphics.Metal
}; };
} }
// Mark dirty // Inline update
_currentState.Dirty.Viewport = true; if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetViewports(renderCommandEncoder);
}
} }
public void UpdateVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers) public void UpdateVertexBuffers(ReadOnlySpan<VertexBufferDescriptor> vertexBuffers)
{ {
_currentState.VertexBuffers = vertexBuffers.ToArray(); _currentState.VertexBuffers = vertexBuffers.ToArray();
// Inline update
if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetVertexBuffers(renderCommandEncoder, _currentState.VertexBuffers);
}
// Mark dirty
_currentState.Dirty.Pipeline = true;
} }
// Inlineable // Inlineable
@ -436,6 +463,13 @@ namespace Ryujinx.Graphics.Metal
}); });
} }
} }
// Inline Update
if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetBuffers(renderCommandEncoder, _currentState.UniformBuffers, true);
}
} }
// Inlineable // Inlineable
@ -456,6 +490,13 @@ namespace Ryujinx.Graphics.Metal
}); });
} }
} }
// Inline Update
if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetBuffers(renderCommandEncoder, _currentState.StorageBuffers, true);
}
} }
// Inlineable // Inlineable
@ -463,8 +504,12 @@ namespace Ryujinx.Graphics.Metal
{ {
_currentState.CullMode = enable ? face.Convert() : MTLCullMode.None; _currentState.CullMode = enable ? face.Convert() : MTLCullMode.None;
// Mark dirty // Inline Update
_currentState.Dirty.CullMode = true; if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetCullMode(renderCommandEncoder);
}
} }
// Inlineable // Inlineable
@ -472,8 +517,12 @@ namespace Ryujinx.Graphics.Metal
{ {
_currentState.Winding = frontFace.Convert(); _currentState.Winding = frontFace.Convert();
// Mark dirty // Inline Update
_currentState.Dirty.Winding = true; if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
SetFrontFace(renderCommandEncoder);
}
} }
// Inlineable // Inlineable
@ -490,6 +539,14 @@ namespace Ryujinx.Graphics.Metal
_currentState.VertexSamplers[binding] = sampler; _currentState.VertexSamplers[binding] = sampler;
break; break;
} }
if (_pipeline.CurrentEncoderType == EncoderType.Render && _pipeline.CurrentEncoder != null)
{
var renderCommandEncoder = new MTLRenderCommandEncoder(_pipeline.CurrentEncoder.Value);
// TODO: Only update the new ones
SetTextureAndSampler(renderCommandEncoder, ShaderStage.Vertex, _currentState.VertexTextures, _currentState.VertexSamplers);
SetTextureAndSampler(renderCommandEncoder, ShaderStage.Fragment, _currentState.FragmentTextures, _currentState.FragmentSamplers);
}
} }
private void SetDepthStencilState(MTLRenderCommandEncoder renderCommandEncoder) private void SetDepthStencilState(MTLRenderCommandEncoder renderCommandEncoder)
@ -509,8 +566,6 @@ namespace Ryujinx.Graphics.Metal
} }
private unsafe void SetScissors(MTLRenderCommandEncoder renderCommandEncoder) private unsafe void SetScissors(MTLRenderCommandEncoder renderCommandEncoder)
{
if (_currentState.Dirty.Scissor)
{ {
if (_currentState.Scissors.Length > 0) if (_currentState.Scissors.Length > 0)
{ {
@ -520,11 +575,8 @@ namespace Ryujinx.Graphics.Metal
} }
} }
} }
}
private unsafe void SetViewports(MTLRenderCommandEncoder renderCommandEncoder) private unsafe void SetViewports(MTLRenderCommandEncoder renderCommandEncoder)
{
if (_currentState.Dirty.Viewport)
{ {
if (_currentState.Viewports.Length > 0) if (_currentState.Viewports.Length > 0)
{ {
@ -534,7 +586,6 @@ namespace Ryujinx.Graphics.Metal
} }
} }
} }
}
private MTLVertexDescriptor BuildVertexDescriptor(VertexBufferDescriptor[] bufferDescriptors, VertexAttribDescriptor[] attribDescriptors) private MTLVertexDescriptor BuildVertexDescriptor(VertexBufferDescriptor[] bufferDescriptors, VertexAttribDescriptor[] attribDescriptors)
{ {
@ -565,7 +616,6 @@ namespace Ryujinx.Graphics.Metal
{ {
var buffers = new List<BufferInfo>(); var buffers = new List<BufferInfo>();
for (int i = 0; i < bufferDescriptors.Length; i++) for (int i = 0; i < bufferDescriptors.Length; i++)
{ {
if (bufferDescriptors[i].Buffer.Handle.ToIntPtr() != IntPtr.Zero) if (bufferDescriptors[i].Buffer.Handle.ToIntPtr() != IntPtr.Zero)
@ -596,20 +646,14 @@ namespace Ryujinx.Graphics.Metal
} }
private void SetCullMode(MTLRenderCommandEncoder renderCommandEncoder) private void SetCullMode(MTLRenderCommandEncoder renderCommandEncoder)
{
if (_currentState.Dirty.CullMode)
{ {
renderCommandEncoder.SetCullMode(_currentState.CullMode); renderCommandEncoder.SetCullMode(_currentState.CullMode);
} }
}
private void SetFrontFace(MTLRenderCommandEncoder renderCommandEncoder) private void SetFrontFace(MTLRenderCommandEncoder renderCommandEncoder)
{
if (_currentState.Dirty.Winding)
{ {
renderCommandEncoder.SetFrontFacingWinding(_currentState.Winding); renderCommandEncoder.SetFrontFacingWinding(_currentState.Winding);
} }
}
private void SetTextureAndSampler(MTLRenderCommandEncoder renderCommandEncoder, ShaderStage stage, Dictionary<ulong, MTLTexture> textures, Dictionary<ulong, MTLSamplerState> samplers) private void SetTextureAndSampler(MTLRenderCommandEncoder renderCommandEncoder, ShaderStage stage, Dictionary<ulong, MTLTexture> textures, Dictionary<ulong, MTLSamplerState> samplers)
{ {