GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-28 09:25:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add index buffer size estimation via mapping size

Browse Source 
This is useful for indirect draws, where we don't know the underlying index buffer size and also don't know the index count.
This commit is contained in:
Billy Laws 2023-02-04 20:53:21 +00:00
parent 0deff5e37a
commit c36b8e843e
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/active_state.cpp
View File

@ -3,6 +3,7 @@
// Copyright © 2022 yuzu Team and Contributors (https://github.com/yuzu-emu/) // Copyright © 2022 yuzu Team and Contributors (https://github.com/yuzu-emu/)
// Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/) // Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
#include <limits>
#include <range/v3/algorithm.hpp> #include <range/v3/algorithm.hpp>
#include <soc/gm20b/channel.h> #include <soc/gm20b/channel.h>
#include <soc/gm20b/gmmu.h> #include <soc/gm20b/gmmu.h>
@ -116,18 +117,25 @@ namespace skyline::gpu::interconnect::maxwell3d {
/* Index Buffer */ /* Index Buffer */
void IndexBufferState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const { void IndexBufferState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const {
manager.Bind(handle, indexBuffer.indexSize, indexBuffer.address); manager.Bind(handle, indexBuffer.indexSize, indexBuffer.address, indexBuffer.limit);
} }
IndexBufferState::IndexBufferState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine) : engine{manager, dirtyHandle, engine} {} IndexBufferState::IndexBufferState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine) : engine{manager, dirtyHandle, engine} {}
void IndexBufferState::Flush(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, u32 firstIndex, u32 elementCount) { void IndexBufferState::Flush(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, bool estimateSize, u32 firstIndex, u32 elementCount) {
didEstimateSize = estimateSize;
usedElementCount = elementCount; usedElementCount = elementCount;
usedFirstIndex = firstIndex; usedFirstIndex = firstIndex;
usedQuadConversion = quadConversion; usedQuadConversion = quadConversion;
size_t size{GetIndexBufferSize(engine->indexBuffer.indexSize, firstIndex + elementCount)}; size_t size{[&] () {
view.Update(ctx, engine->indexBuffer.address, size); if (estimateSize)
return engine->indexBuffer.address - engine->indexBuffer.limit + 1;
else
return GetIndexBufferSize(engine->indexBuffer.indexSize, firstIndex + elementCount);
}()};
view.Update(ctx, engine->indexBuffer.address, size, !estimateSize);
if (!*view) { if (!*view) {
Logger::Warn("Unmapped index buffer: 0x{:X}", engine->indexBuffer.address); Logger::Warn("Unmapped index buffer: 0x{:X}", engine->indexBuffer.address);
return; return;
@ -149,17 +157,11 @@ namespace skyline::gpu::interconnect::maxwell3d {
builder.SetIndexBuffer(*view, indexType); builder.SetIndexBuffer(*view, indexType);
} }
bool IndexBufferState::Refresh(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, u32 firstIndex, u32 elementCount) { bool IndexBufferState::Refresh(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, bool estimateSize, u32 firstIndex, u32 elementCount) {
if (*view) if (*view)
view->GetBuffer()->PopulateReadBarrier(vk::PipelineStageFlagBits::eVertexInput, srcStageMask, dstStageMask); view->GetBuffer()->PopulateReadBarrier(vk::PipelineStageFlagBits::eVertexInput, srcStageMask, dstStageMask);
if (elementCount > usedElementCount) if (didEstimateSize != estimateSize || (elementCount + firstIndex > usedElementCount + usedFirstIndex) || quadConversion != usedQuadConversion)
return true;
if (quadConversion != usedQuadConversion)
return true;
if (quadConversion != usedQuadConversion)
return true; return true;
// TODO: optimise this to use buffer sequencing to avoid needing to regenerate the quad buffer every time. We can't use as it is rn though because sequences aren't globally unique and may conflict after buffer recreation // TODO: optimise this to use buffer sequencing to avoid needing to regenerate the quad buffer every time. We can't use as it is rn though because sequences aren't globally unique and may conflict after buffer recreation
@ -431,7 +433,7 @@ namespace skyline::gpu::interconnect::maxwell3d {
} }
void ActiveState::Update(InterconnectContext &ctx, Textures &textures, ConstantBufferSet &constantBuffers, StateUpdateBuilder &builder, void ActiveState::Update(InterconnectContext &ctx, Textures &textures, ConstantBufferSet &constantBuffers, StateUpdateBuilder &builder,
bool indexed, engine::DrawTopology topology, u32 drawFirstIndex, u32 drawElementCount, bool indexed, engine::DrawTopology topology, bool estimateIndexBufferSize, u32 drawFirstIndex, u32 drawElementCount,
vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask) { vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask) {
if (topology != directState.inputAssembly.GetPrimitiveTopology()) { if (topology != directState.inputAssembly.GetPrimitiveTopology()) {
directState.inputAssembly.SetPrimitiveTopology(topology); directState.inputAssembly.SetPrimitiveTopology(topology);
@ -444,7 +446,7 @@ namespace skyline::gpu::interconnect::maxwell3d {
pipeline.Update(ctx, textures, constantBuffers, builder); pipeline.Update(ctx, textures, constantBuffers, builder);
ranges::for_each(vertexBuffers, updateFuncBuffer); ranges::for_each(vertexBuffers, updateFuncBuffer);
if (indexed) if (indexed)
updateFuncBuffer(indexBuffer, directState.inputAssembly.NeedsQuadConversion(), drawFirstIndex, drawElementCount); updateFuncBuffer(indexBuffer, directState.inputAssembly.NeedsQuadConversion(), estimateIndexBufferSize, drawFirstIndex, drawElementCount);
ranges::for_each(transformFeedbackBuffers, updateFuncBuffer); ranges::for_each(transformFeedbackBuffers, updateFuncBuffer);
ranges::for_each(viewports, updateFunc); ranges::for_each(viewports, updateFunc);
ranges::for_each(scissors, updateFunc); ranges::for_each(scissors, updateFunc);

8
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/active_state.h
View File

@ -47,6 +47,7 @@ namespace skyline::gpu::interconnect::maxwell3d {
CachedMappedBufferView view{}; CachedMappedBufferView view{};
BufferBinding megaBufferBinding{}; BufferBinding megaBufferBinding{};
vk::IndexType indexType{}; vk::IndexType indexType{};
bool didEstimateSize{};
u32 usedElementCount{}; u32 usedElementCount{};
u32 usedFirstIndex{}; u32 usedFirstIndex{};
bool usedQuadConversion{}; bool usedQuadConversion{};
@ -54,9 +55,9 @@ namespace skyline::gpu::interconnect::maxwell3d {
public: public:
IndexBufferState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine); IndexBufferState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine);
void Flush(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, u32 firstIndex, u32 elementCount); void Flush(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, bool estimateSize, u32 firstIndex, u32 elementCount);
bool Refresh(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, u32 firstIndex, u32 elementCount); bool Refresh(InterconnectContext &ctx, StateUpdateBuilder &builder, vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask, bool quadConversion, bool estimateSize, u32 firstIndex, u32 elementCount);
void PurgeCaches(); void PurgeCaches();
}; };
@ -259,9 +260,10 @@ namespace skyline::gpu::interconnect::maxwell3d {
/** /**
* @brief Updates the active state for a given draw operation, removing the dirtiness of all member states * @brief Updates the active state for a given draw operation, removing the dirtiness of all member states
* @note If `extimateIndexBufferSize` is false and `indexed` is true the `drawFirstIndex` and `drawElementCount` arguments must be populated
*/ */
void Update(InterconnectContext &ctx, Textures &textures, ConstantBufferSet &constantBuffers, StateUpdateBuilder &builder, void Update(InterconnectContext &ctx, Textures &textures, ConstantBufferSet &constantBuffers, StateUpdateBuilder &builder,
bool indexed, engine::DrawTopology topology, u32 drawFirstIndex, u32 drawElementCount, bool indexed, engine::DrawTopology topology, bool estimateIndexBufferSize, u32 drawFirstIndex, u32 drawElementCount,
vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask); vk::PipelineStageFlags &srcStageMask, vk::PipelineStageFlags &dstStageMask);
Pipeline *GetPipeline(); Pipeline *GetPipeline();