GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-01-16 10:57:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Expose way to check inter-pipeline descriptor compatibility

Browse Source 
Allows users to skip/use quick descriptor sync even after switching pipelines.
This commit is contained in:
Billy Laws 2022-09-18 16:31:25 +01:00
parent 943a38e168
commit 3b26f4f48a
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.cpp
View File

@ -561,6 +561,21 @@ namespace skyline::gpu::interconnect::maxwell3d {
transitionCacheNextIdx = (transitionCacheNextIdx + 1) % transitionCache.size(); transitionCacheNextIdx = (transitionCacheNextIdx + 1) % transitionCache.size();
} }
bool Pipeline::CheckBindingMatch(Pipeline *other) {
if (auto it{bindingMatchCache.find(other)}; it != bindingMatchCache.end())
return it->second;
for (size_t i{}; i < shaderStages.size(); i++) {
if (!shaderStages[i].BindingsEqual(other->shaderStages[i])) {
bindingMatchCache[other] = false;
return false;
}
}
bindingMatchCache[other] = true;
return true;
}
static DynamicBufferBinding GetConstantBufferBinding(InterconnectContext &ctx, const Shader::Info &info, BufferView view, size_t idx) { static DynamicBufferBinding GetConstantBufferBinding(InterconnectContext &ctx, const Shader::Info &info, BufferView view, size_t idx) {
ctx.executor.AttachBuffer(view); ctx.executor.AttachBuffer(view);

16
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.h
View File

@ -26,6 +26,18 @@ namespace skyline::gpu::interconnect::maxwell3d {
vk::ShaderStageFlagBits stage; vk::ShaderStageFlagBits stage;
vk::ShaderModule module; vk::ShaderModule module;
Shader::Info info; Shader::Info info;
/**
* @return Whether the bindings for this stage match those of the input stage
*/
bool BindingsEqual(const ShaderStage &other) const {
return info.constant_buffer_descriptors == other.info.constant_buffer_descriptors &&
info.storage_buffers_descriptors == other.info.storage_buffers_descriptors &&
info.texture_buffer_descriptors == other.info.texture_buffer_descriptors &&
info.image_buffer_descriptors == other.info.image_buffer_descriptors &&
info.texture_descriptors == other.info.texture_descriptors &&
info.image_descriptors == other.info.image_descriptors;
}
}; };
struct DescriptorInfo { struct DescriptorInfo {
@ -69,6 +81,8 @@ namespace skyline::gpu::interconnect::maxwell3d {
std::array<Pipeline *, 4> transitionCache{}; std::array<Pipeline *, 4> transitionCache{};
size_t transitionCacheNextIdx{}; size_t transitionCacheNextIdx{};
tsl::robin_map<Pipeline *, bool> bindingMatchCache; //!< Cache of which pipelines have bindings that match this pipeline
public: public:
PackedPipelineState sourcePackedState; PackedPipelineState sourcePackedState;
@ -78,6 +92,8 @@ namespace skyline::gpu::interconnect::maxwell3d {
void AddTransition(Pipeline *next); void AddTransition(Pipeline *next);
bool CheckBindingMatch(Pipeline *other);
void SyncDescriptors(InterconnectContext &ctx, ConstantBufferSet &constantBuffers); void SyncDescriptors(InterconnectContext &ctx, ConstantBufferSet &constantBuffers);
void SyncDescriptorsQuickBind(InterconnectContext &ctx, ConstantBufferSet &constantBuffers, ConstantBuffers::QuickBind quickBind); void SyncDescriptorsQuickBind(InterconnectContext &ctx, ConstantBufferSet &constantBuffers, ConstantBuffers::QuickBind quickBind);