mirror of
https://github.com/GreemDev/Ryujinx.git
synced 2024-11-24 18:20:12 +01:00
Fix Scott Pilgrim (#15)
* check for null vertex functions * format * Format --------- Co-authored-by: Isaac Marovitz <isaacryu@icloud.com>
This commit is contained in:
parent
8b7ac4e87f
commit
20b1f6a6ee
@ -227,29 +227,38 @@ namespace Ryujinx.Graphics.Metal
|
|||||||
var vertexDescriptor = BuildVertexDescriptor(_currentState.VertexBuffers, _currentState.VertexAttribs);
|
var vertexDescriptor = BuildVertexDescriptor(_currentState.VertexBuffers, _currentState.VertexAttribs);
|
||||||
renderPipelineDescriptor.VertexDescriptor = vertexDescriptor;
|
renderPipelineDescriptor.VertexDescriptor = vertexDescriptor;
|
||||||
|
|
||||||
if (_currentState.VertexFunction != null)
|
try
|
||||||
{
|
{
|
||||||
renderPipelineDescriptor.VertexFunction = _currentState.VertexFunction.Value;
|
if (_currentState.VertexFunction != null)
|
||||||
}
|
{
|
||||||
|
renderPipelineDescriptor.VertexFunction = _currentState.VertexFunction.Value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (_currentState.FragmentFunction != null)
|
if (_currentState.FragmentFunction != null)
|
||||||
|
{
|
||||||
|
renderPipelineDescriptor.FragmentFunction = _currentState.FragmentFunction.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
var pipelineState = _renderPipelineCache.GetOrCreate(renderPipelineDescriptor);
|
||||||
|
|
||||||
|
renderCommandEncoder.SetRenderPipelineState(pipelineState);
|
||||||
|
|
||||||
|
renderCommandEncoder.SetBlendColor(
|
||||||
|
_currentState.BlendColor.Red,
|
||||||
|
_currentState.BlendColor.Green,
|
||||||
|
_currentState.BlendColor.Blue,
|
||||||
|
_currentState.BlendColor.Alpha);
|
||||||
|
}
|
||||||
|
finally
|
||||||
{
|
{
|
||||||
renderPipelineDescriptor.FragmentFunction = _currentState.FragmentFunction.Value;
|
// Cleanup
|
||||||
|
renderPipelineDescriptor.Dispose();
|
||||||
|
vertexDescriptor.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
var pipelineState = _renderPipelineCache.GetOrCreate(renderPipelineDescriptor);
|
|
||||||
|
|
||||||
renderCommandEncoder.SetRenderPipelineState(pipelineState);
|
|
||||||
|
|
||||||
renderCommandEncoder.SetBlendColor(
|
|
||||||
_currentState.BlendColor.Red,
|
|
||||||
_currentState.BlendColor.Green,
|
|
||||||
_currentState.BlendColor.Blue,
|
|
||||||
_currentState.BlendColor.Alpha);
|
|
||||||
|
|
||||||
// Cleanup
|
|
||||||
renderPipelineDescriptor.Dispose();
|
|
||||||
vertexDescriptor.Dispose();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateIndexBuffer(BufferRange buffer, IndexType type)
|
public void UpdateIndexBuffer(BufferRange buffer, IndexType type)
|
||||||
|
Loading…
Reference in New Issue
Block a user