NaxdyOrg/Ryujinx
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

Fix draw indexed flag not being cleared for instanced draws, also avoid state updates in the middle of a indexed draw

Browse source
This commit is contained in:
gdkchan 2019-12-08 18:08:00 -03:00 committed by Thog
parent 23b8a86d35
commit 375ee0ba96
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Ryujinx.Graphics.Gpu/Engine/MethodDraw.cs
View file

@ -26,29 +26,35 @@ namespace Ryujinx.Graphics.Gpu.Engine
private void DrawEnd(GpuState state, int argument) private void DrawEnd(GpuState state, int argument)
{ {
if (_instancedDrawPending)
{
_drawIndexed = false;
return;
}
UpdateState(state); UpdateState(state);
bool instanced = _vsUsesInstanceId || _isAnyVbInstanced; bool instanced = _vsUsesInstanceId || _isAnyVbInstanced;
if (instanced) if (instanced)
{ {
if (!_instancedDrawPending) _instancedDrawPending = true;
{
_instancedDrawPending = true;
_instancedIndexed = _drawIndexed; _instancedIndexed = _drawIndexed;
_instancedFirstIndex = _firstIndex; _instancedFirstIndex = _firstIndex;
_instancedFirstVertex = state.Get<int>(MethodOffset.FirstVertex); _instancedFirstVertex = state.Get<int>(MethodOffset.FirstVertex);
_instancedFirstInstance = state.Get<int>(MethodOffset.FirstInstance); _instancedFirstInstance = state.Get<int>(MethodOffset.FirstInstance);
_instancedIndexCount = _indexCount; _instancedIndexCount = _indexCount;
var drawState = state.Get<VertexBufferDrawState>(MethodOffset.VertexBufferDrawState); var drawState = state.Get<VertexBufferDrawState>(MethodOffset.VertexBufferDrawState);
_instancedDrawStateFirst = drawState.First; _instancedDrawStateFirst = drawState.First;
_instancedDrawStateCount = drawState.Count; _instancedDrawStateCount = drawState.Count;
}
_drawIndexed = false;
return; return;
} }