mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-18 06:38:42 +02:00
Fix DrawArrays vertex buffer size (#4141)
This commit is contained in:
parent
c200a7b7c6
commit
cb70e7bb30
3 changed files with 20 additions and 9 deletions
|
@ -142,6 +142,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
|
|
||||||
_drawState.FirstIndex = firstIndex;
|
_drawState.FirstIndex = firstIndex;
|
||||||
_drawState.IndexCount = indexCount;
|
_drawState.IndexCount = indexCount;
|
||||||
|
_drawState.DrawFirstVertex = drawFirstVertex;
|
||||||
|
_drawState.DrawVertexCount = drawVertexCount;
|
||||||
_currentSpecState.SetHasConstantBufferDrawParameters(false);
|
_currentSpecState.SetHasConstantBufferDrawParameters(false);
|
||||||
|
|
||||||
engine.UpdateState();
|
engine.UpdateState();
|
||||||
|
@ -163,10 +165,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
|
|
||||||
_instancedIndexCount = ibCount != 0 ? ibCount : indexCount;
|
_instancedIndexCount = ibCount != 0 ? ibCount : indexCount;
|
||||||
|
|
||||||
var drawState = _state.State.VertexBufferDrawState;
|
_instancedDrawStateFirst = drawFirstVertex;
|
||||||
|
_instancedDrawStateCount = drawVertexCount;
|
||||||
_instancedDrawStateFirst = drawState.First;
|
|
||||||
_instancedDrawStateCount = drawState.Count;
|
|
||||||
|
|
||||||
_drawState.DrawIndexed = false;
|
_drawState.DrawIndexed = false;
|
||||||
|
|
||||||
|
@ -415,6 +415,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
bool oldDrawIndexed = _drawState.DrawIndexed;
|
bool oldDrawIndexed = _drawState.DrawIndexed;
|
||||||
|
|
||||||
_drawState.DrawIndexed = false;
|
_drawState.DrawIndexed = false;
|
||||||
|
engine.ForceStateDirty(VertexBufferFirstMethodOffset * 4);
|
||||||
|
|
||||||
DrawEnd(engine, 0, 0, firstVertex, vertexCount);
|
DrawEnd(engine, 0, 0, firstVertex, vertexCount);
|
||||||
|
|
||||||
|
@ -526,8 +527,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_state.State.VertexBufferDrawState.First = firstVertex;
|
_drawState.DrawFirstVertex = firstVertex;
|
||||||
_state.State.VertexBufferDrawState.Count = count;
|
_drawState.DrawVertexCount = count;
|
||||||
engine.ForceStateDirty(VertexBufferFirstMethodOffset * 4);
|
engine.ForceStateDirty(VertexBufferFirstMethodOffset * 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,16 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int IndexCount;
|
public int IndexCount;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// First vertex used on non-indexed draws. This value is stored somewhere else on indexed draws.
|
||||||
|
/// </summary>
|
||||||
|
public int DrawFirstVertex;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Vertex count used on non-indexed draws. Indexed draws have a index count instead.
|
||||||
|
/// </summary>
|
||||||
|
public int DrawVertexCount;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Indicates if the next draw will be a indexed draw.
|
/// Indicates if the next draw will be a indexed draw.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -989,6 +989,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
|
|
||||||
bool drawIndexed = _drawState.DrawIndexed;
|
bool drawIndexed = _drawState.DrawIndexed;
|
||||||
bool drawIndirect = _drawState.DrawIndirect;
|
bool drawIndirect = _drawState.DrawIndirect;
|
||||||
|
int drawFirstVertex = _drawState.DrawFirstVertex;
|
||||||
|
int drawVertexCount = _drawState.DrawVertexCount;
|
||||||
uint vbEnableMask = 0;
|
uint vbEnableMask = 0;
|
||||||
|
|
||||||
for (int index = 0; index < Constants.TotalVertexBuffers; index++)
|
for (int index = 0; index < Constants.TotalVertexBuffers; index++)
|
||||||
|
@ -1050,9 +1052,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
|
||||||
|
|
||||||
int firstInstance = (int)_state.State.FirstInstance;
|
int firstInstance = (int)_state.State.FirstInstance;
|
||||||
|
|
||||||
var drawState = _state.State.VertexBufferDrawState;
|
size = Math.Min(vbSize, (ulong)((firstInstance + drawFirstVertex + drawVertexCount) * stride));
|
||||||
|
|
||||||
size = Math.Min(vbSize, (ulong)((firstInstance + drawState.First + drawState.Count) * stride));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_pipeline.VertexBuffers[index] = new BufferPipelineDescriptor(_channel.MemoryManager.IsMapped(address), stride, divisor);
|
_pipeline.VertexBuffers[index] = new BufferPipelineDescriptor(_channel.MemoryManager.IsMapped(address), stride, divisor);
|
||||||
|
|
Loading…
Reference in a new issue