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

Merge branch 'master' into MoreDynamicStatesPartOne

Browse source
This commit is contained in:
sunshineinabox 2024-09-22 17:18:45 -07:00 • committed by GitHub
commit 9fbfcae162
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
79 changed files with 1595 additions and 598 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
View file

@ -677,7 +677,7 @@ namespace Ryujinx.Graphics.Vulkan
oldStencilTestEnable = _newState.StencilTestEnable;
oldDepthTestEnable = _newState.DepthTestEnable;
oldDepthWriteEnable = _newState.DepthWriteEnable;
oldTopology = _newState.Topology;
oldTopology = _topology;
oldViewportsCount = _newState.ViewportsCount;
}
@ -705,14 +705,13 @@ namespace Ryujinx.Graphics.Vulkan
srcRegion,
dstRegion);
_newState.Topology = oldTopology;
SetPrimitiveTopology(oldTopology);
if (_supportExtDynamic)
{
DynamicState.SetCullMode(oldCullMode);
DynamicState.SetStencilTest(oldStencilTestEnable);
DynamicState.SetDepthTestBool(oldDepthTestEnable, oldDepthWriteEnable);
DynamicState.SetPrimitiveTopology(oldTopology);
}
else
{
@ -949,9 +948,9 @@ namespace Ryujinx.Graphics.Vulkan
}
}
public void SetImage(ShaderStage stage, int binding, ITexture image, Format imageFormat)
public void SetImage(ShaderStage stage, int binding, ITexture image)
{
_descriptorSetUpdater.SetImage(Cbs, stage, binding, image, imageFormat);
_descriptorSetUpdater.SetImage(Cbs, stage, binding, image);
}
public void SetImage(int binding, Auto<DisposableImageView> image)