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

Resolve build errors

Browse source
This commit is contained in:
sunshineinabox 2024-08-01 19:21:32 -07:00
parent fa801ba472
commit 023f3ed44f
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Ryujinx.Graphics.Vulkan/PipelineConverter.cs
View file

@ -169,19 +169,19 @@ namespace Ryujinx.Graphics.Vulkan
pipeline.PolygonMode = PolygonMode.Fill; // Not implemented. pipeline.PolygonMode = PolygonMode.Fill; // Not implemented.
if (!gd.Capabilities.SupportsExtendedDynamicState2) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2)
{ {
pipeline.PrimitiveRestartEnable = state.PrimitiveRestartEnable; pipeline.PrimitiveRestartEnable = state.PrimitiveRestartEnable;
pipeline.RasterizerDiscardEnable = state.RasterizerDiscard; pipeline.RasterizerDiscardEnable = state.RasterizerDiscard;
pipeline.DepthBiasEnable = state.BiasEnable != 0; pipeline.DepthBiasEnable = state.BiasEnable != 0;
} }
if (!gd.ExtendedDynamicState2Features.ExtendedDynamicState2LogicOp) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2LogicOp)
{ {
pipeline.LogicOp = state.LogicOpEnable ? state.LogicOp.Convert() : default; pipeline.LogicOp = state.LogicOpEnable ? state.LogicOp.Convert() : default;
} }
if (!gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
{ {
pipeline.PatchControlPoints = state.PatchControlPoints; pipeline.PatchControlPoints = state.PatchControlPoints;
} }

6
src/Ryujinx.Graphics.Vulkan/PipelineDynamicState.cs
View file

@ -242,7 +242,7 @@ namespace Ryujinx.Graphics.Vulkan
_dirty |= DirtyFlags.Extended; _dirty |= DirtyFlags.Extended;
} }
if (gd.Capabilities.SupportsExtendedDynamicState2) if (gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2)
{ {
_dirty |= DirtyFlags.Extended2; _dirty |= DirtyFlags.Extended2;
} }
@ -252,12 +252,12 @@ namespace Ryujinx.Graphics.Vulkan
_dirty &= ~DirtyFlags.LineWidth; _dirty &= ~DirtyFlags.LineWidth;
} }
if (!gd.ExtendedDynamicState2Features.ExtendedDynamicState2LogicOp) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2LogicOp)
{ {
_dirty &= ~DirtyFlags.LogicOp; _dirty &= ~DirtyFlags.LogicOp;
} }
if (!gd.ExtendedDynamicState2Features.ExtendedDynamicState2PatchControlPoints) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints)
{ {
_dirty &= ~DirtyFlags.PatchControlPoints; _dirty &= ~DirtyFlags.PatchControlPoints;
} }

4
src/Ryujinx.Graphics.Vulkan/PipelineState.cs
View file

@ -429,7 +429,7 @@ namespace Ryujinx.Graphics.Vulkan
PipelineTessellationStateCreateInfo tessellationState; PipelineTessellationStateCreateInfo tessellationState;
if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints && HasTessellationControlShader)
{ {
tessellationState.SType = StructureType.PipelineTessellationStateCreateInfo; tessellationState.SType = StructureType.PipelineTessellationStateCreateInfo;
tessellationState.PatchControlPoints = PatchControlPoints; tessellationState.PatchControlPoints = PatchControlPoints;
@ -643,7 +643,7 @@ namespace Ryujinx.Graphics.Vulkan
RenderPass = renderPass, RenderPass = renderPass,
}; };
if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints) if (!gd.Capabilities.SupportsExtendedDynamicState2.ExtendedDynamicState2PatchControlPoints && HasTessellationControlShader)
{ {
pipelineCreateInfo.PTessellationState = &tessellationState; pipelineCreateInfo.PTessellationState = &tessellationState;
} }