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

Don’t use Enum.HasFlag

Browse source
This commit is contained in:
Isaac Marovitz 2024-07-01 23:07:02 +01:00 committed by Isaac Marovitz
parent daee63c451
commit 5e8606c89a
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,6 @@ using Ryujinx.Graphics.Metal.State;
using Ryujinx.Graphics.Shader; using Ryujinx.Graphics.Shader;
using SharpMetal.Metal; using SharpMetal.Metal;
using System; using System;
using System.Linq;
using System.Runtime.Versioning; using System.Runtime.Versioning;
namespace Ryujinx.Graphics.Metal namespace Ryujinx.Graphics.Metal

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

@ -177,63 +177,63 @@ namespace Ryujinx.Graphics.Metal
public void RebindRenderState(MTLRenderCommandEncoder renderCommandEncoder) public void RebindRenderState(MTLRenderCommandEncoder renderCommandEncoder)
{ {
if (_currentState.Dirty.HasFlag(DirtyFlags.RenderPipeline)) if ((_currentState.Dirty & DirtyFlags.RenderPipeline) != 0)
{ {
SetRenderPipelineState(renderCommandEncoder); SetRenderPipelineState(renderCommandEncoder);
SetVertexBuffers(renderCommandEncoder, _currentState.VertexBuffers); SetVertexBuffers(renderCommandEncoder, _currentState.VertexBuffers);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.DepthStencil)) if ((_currentState.Dirty & DirtyFlags.DepthStencil) != 0)
{ {
SetDepthStencilState(renderCommandEncoder); SetDepthStencilState(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.DepthClamp)) if ((_currentState.Dirty & DirtyFlags.DepthClamp) != 0)
{ {
SetDepthClamp(renderCommandEncoder); SetDepthClamp(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.DepthBias)) if ((_currentState.Dirty & DirtyFlags.DepthBias) != 0)
{ {
SetDepthBias(renderCommandEncoder); SetDepthBias(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.CullMode)) if ((_currentState.Dirty & DirtyFlags.CullMode) != 0)
{ {
SetCullMode(renderCommandEncoder); SetCullMode(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.FrontFace)) if ((_currentState.Dirty & DirtyFlags.FrontFace) != 0)
{ {
SetFrontFace(renderCommandEncoder); SetFrontFace(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.StencilRef)) if ((_currentState.Dirty & DirtyFlags.StencilRef) != 0)
{ {
SetStencilRefValue(renderCommandEncoder); SetStencilRefValue(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.Viewports)) if ((_currentState.Dirty & DirtyFlags.Viewports) != 0)
{ {
SetViewports(renderCommandEncoder); SetViewports(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.Scissors)) if ((_currentState.Dirty & DirtyFlags.Scissors) != 0)
{ {
SetScissors(renderCommandEncoder); SetScissors(renderCommandEncoder);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.Uniforms)) if ((_currentState.Dirty & DirtyFlags.Uniforms) != 0)
{ {
UpdateAndBind(renderCommandEncoder, _currentState.RenderProgram, MetalRenderer.UniformSetIndex); UpdateAndBind(renderCommandEncoder, _currentState.RenderProgram, MetalRenderer.UniformSetIndex);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.Storages)) if ((_currentState.Dirty & DirtyFlags.Storages) != 0)
{ {
UpdateAndBind(renderCommandEncoder, _currentState.RenderProgram, MetalRenderer.StorageSetIndex); UpdateAndBind(renderCommandEncoder, _currentState.RenderProgram, MetalRenderer.StorageSetIndex);
} }
if (_currentState.Dirty.HasFlag(DirtyFlags.Textures)) if ((_currentState.Dirty & DirtyFlags.Textures) != 0)
{ {
UpdateAndBind(renderCommandEncoder, _currentState.RenderProgram, MetalRenderer.TextureSetIndex); UpdateAndBind(renderCommandEncoder, _currentState.RenderProgram, MetalRenderer.TextureSetIndex);
} }
@ -1031,7 +1031,7 @@ namespace Ryujinx.Graphics.Metal
MTLRenderStages renderStages = 0; MTLRenderStages renderStages = 0;
if (segment.Stages.HasFlag(ResourceStages.Vertex)) if ((segment.Stages & ResourceStages.Vertex) != 0)
{ {
vertResourceIds[vertResourceIdIndex] = mtlBuffer.GpuAddress + (ulong)offset; vertResourceIds[vertResourceIdIndex] = mtlBuffer.GpuAddress + (ulong)offset;
vertResourceIdIndex++; vertResourceIdIndex++;
@ -1039,7 +1039,7 @@ namespace Ryujinx.Graphics.Metal
renderStages |= MTLRenderStages.RenderStageVertex; renderStages |= MTLRenderStages.RenderStageVertex;
} }
if (segment.Stages.HasFlag(ResourceStages.Fragment)) if ((segment.Stages & ResourceStages.Fragment) != 0)
{ {
fragResourceIds[fragResourceIdIndex] = mtlBuffer.GpuAddress + (ulong)offset; fragResourceIds[fragResourceIdIndex] = mtlBuffer.GpuAddress + (ulong)offset;
fragResourceIdIndex++; fragResourceIdIndex++;