vance/ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vulkan: Fix barriers on macOS (#5700)

Browse Source 
* Use old method on macOS

* gdk suggestions

* Update src/Ryujinx.Graphics.Vulkan/TextureStorage.cs

Co-authored-by: gdkchan <gab.dark.100@gmail.com>

* Update src/Ryujinx.Graphics.Vulkan/TextureStorage.cs

Co-authored-by: gdkchan <gab.dark.100@gmail.com>

---------

Co-authored-by: gdkchan <gab.dark.100@gmail.com>
This commit is contained in:
Isaac Marovitz 2023-09-23 18:32:36 -04:00 committed by GitHub
parent fe9e19d8cc
commit d9f9bbfaa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/Ryujinx.Graphics.Vulkan/TextureStorage.cs
View File

@ -454,13 +454,36 @@ namespace Ryujinx.Graphics.Vulkan
if (lastReadStage != PipelineStageFlags.None) if (lastReadStage != PipelineStageFlags.None)
{ {
TextureView.InsertMemoryBarrier( // This would result in a validation error, but is
_gd.Api, // required on MoltenVK as the generic barrier results in
cbs.CommandBuffer, // severe texture flickering in some scenarios.
_lastReadAccess, if (_gd.IsMoltenVk)
dstAccessFlags, {
lastReadStage, ImageAspectFlags aspectFlags = Info.Format.ConvertAspectFlags();
dstStageFlags); TextureView.InsertImageBarrier(
_gd.Api,
cbs.CommandBuffer,
_imageAuto.Get(cbs).Value,
_lastReadAccess,
dstAccessFlags,
_lastReadStage,
dstStageFlags,
aspectFlags,
0,
0,
_info.GetLayers(),
_info.Levels);
}
else
{
TextureView.InsertMemoryBarrier(
_gd.Api,
cbs.CommandBuffer,
_lastReadAccess,
dstAccessFlags,
lastReadStage,
dstStageFlags);
}
_lastReadAccess = AccessFlags.None; _lastReadAccess = AccessFlags.None;
_lastReadStage = PipelineStageFlags.None; _lastReadStage = PipelineStageFlags.None;
@ -474,13 +497,36 @@ namespace Ryujinx.Graphics.Vulkan
if (_lastModificationAccess != AccessFlags.None) if (_lastModificationAccess != AccessFlags.None)
{ {
TextureView.InsertMemoryBarrier( // This would result in a validation error, but is
_gd.Api, // required on MoltenVK as the generic barrier results in
cbs.CommandBuffer, // severe texture flickering in some scenarios.
_lastModificationAccess, if (_gd.IsMoltenVk)
dstAccessFlags, {
_lastModificationStage, ImageAspectFlags aspectFlags = Info.Format.ConvertAspectFlags();
dstStageFlags); TextureView.InsertImageBarrier(
_gd.Api,
cbs.CommandBuffer,
_imageAuto.Get(cbs).Value,
_lastModificationAccess,
dstAccessFlags,
_lastModificationStage,
dstStageFlags,
aspectFlags,
0,
0,
_info.GetLayers(),
_info.Levels);
}
else
{
TextureView.InsertMemoryBarrier(
_gd.Api,
cbs.CommandBuffer,
_lastModificationAccess,
dstAccessFlags,
_lastModificationStage,
dstStageFlags);
}
_lastModificationAccess = AccessFlags.None; _lastModificationAccess = AccessFlags.None;
} }