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

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

@ -1588,36 +1588,42 @@ namespace Ryujinx.Graphics.Vulkan
DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer); DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);
if (_needsIndexBufferRebind && _indexBufferPattern == null) // Setting graphics state with a compute pipeline bound crashes the Adreno driver.
if (pbp == PipelineBindPoint.Graphics)
{ {
_indexBuffer.BindIndexBuffer(Gd, Cbs); DynamicState.ReplayIfDirty(Gd.Api, CommandBuffer);
_needsIndexBufferRebind = false;
}
if (_needsTransformFeedbackBuffersRebind) if (_needsIndexBufferRebind && _indexBufferPattern == null)
{
PauseTransformFeedbackInternal();
for (int i = 0; i < Constants.MaxTransformFeedbackBuffers; i++)
{ {
_transformFeedbackBuffers[i].BindTransformFeedbackBuffer(Gd, Cbs, (uint)i); _indexBuffer.BindIndexBuffer(Gd, Cbs);
_needsIndexBufferRebind = false;
} }
_needsTransformFeedbackBuffersRebind = false; if (_needsTransformFeedbackBuffersRebind)
}
if (_vertexBuffersDirty != 0)
{
while (_vertexBuffersDirty != 0)
{ {
int i = BitOperations.TrailingZeroCount(_vertexBuffersDirty); PauseTransformFeedbackInternal();
_vertexBuffers[i].BindVertexBuffer(Gd, Cbs, (uint)i, ref _newState, _vertexBufferUpdater); for (int i = 0; i < Constants.MaxTransformFeedbackBuffers; i++)
{
_transformFeedbackBuffers[i].BindTransformFeedbackBuffer(Gd, Cbs, (uint)i);
}
_vertexBuffersDirty &= ~(1UL << i); _needsTransformFeedbackBuffersRebind = false;
} }
_vertexBufferUpdater.Commit(Cbs); if (_vertexBuffersDirty != 0)
{
while (_vertexBuffersDirty != 0)
{
int i = BitOperations.TrailingZeroCount(_vertexBuffersDirty);
_vertexBuffers[i].BindVertexBuffer(Gd, Cbs, (uint)i, ref _newState, _vertexBufferUpdater);
_vertexBuffersDirty &= ~(1UL << i);
}
_vertexBufferUpdater.Commit(Cbs);
}
} }
if (_stateDirty || Pbp != pbp) if (_stateDirty || Pbp != pbp)

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

@ -246,7 +246,11 @@ namespace Ryujinx.Graphics.Vulkan
SignalCommandBufferChange(); SignalCommandBufferChange();
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);
}
} }
public void FlushCommandsImpl() public void FlushCommandsImpl()