guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

Work around Adreno compute dispatch crash when changing grpahics state with a compute pipeline bound

Browse Source
This commit is contained in:
Gabriel A 2023-07-10 23:32:31 -03:00 committed by Emmanuel Hansen
parent 437bfdbd5a
commit 2814fa60bf
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
View File

@ -1588,6 +1588,11 @@ namespace Ryujinx.Graphics.Vulkan
DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer); DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);
// Setting graphics state with a compute pipeline bound crashes the Adreno driver.
if (pbp == PipelineBindPoint.Graphics)
{
DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);
if (_needsIndexBufferRebind && _indexBufferPattern == null) if (_needsIndexBufferRebind && _indexBufferPattern == null)
{ {
_indexBuffer.BindIndexBuffer(Gd, Cbs); _indexBuffer.BindIndexBuffer(Gd, Cbs);
@ -1619,6 +1624,7 @@ namespace Ryujinx.Graphics.Vulkan
_vertexBufferUpdater.Commit(Cbs); _vertexBufferUpdater.Commit(Cbs);
} }
}
if (_stateDirty || Pbp != pbp) if (_stateDirty || Pbp != pbp)
{ {

4
src/Ryujinx.Graphics.Vulkan/PipelineFull.cs
View File

@ -246,8 +246,12 @@ namespace Ryujinx.Graphics.Vulkan
SignalCommandBufferChange(); SignalCommandBufferChange();
// Setting graphics state with a compute pipeline bound crashes the Adreno driver.
if (Pbp == PipelineBindPoint.Graphics)
{
DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer); DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);
} }
}
public void FlushCommandsImpl() public void FlushCommandsImpl()
{ {