The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-06-01 15:39:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add quirk for 615 drivers with broken multithreaded compilation

Browse Source
This commit is contained in:
Billy Laws 2022-12-10 15:36:19 +00:00
parent 755f7c75af
commit ffe7263848
5 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/cpp/skyline/gpu/cache/graphics_pipeline_cache.cpp vendored
View File

@ -6,7 +6,10 @@
#include "graphics_pipeline_cache.h"
namespace skyline::gpu::cache {
GraphicsPipelineCache::GraphicsPipelineCache(GPU &gpu) : gpu(gpu), vkPipelineCache(gpu.vkDevice, vk::PipelineCacheCreateInfo{}) {}
GraphicsPipelineCache::GraphicsPipelineCache(GPU &gpu)
: gpu{gpu},
vkPipelineCache{gpu.vkDevice, vk::PipelineCacheCreateInfo{}},
pool{gpu.traits.quirks.brokenMultithreadedPipelineCompilation ? 1U : 0U} {}
#define VEC_CPY(pointer, size) state.pointer, state.pointer + state.size
@ -396,4 +399,8 @@ namespace skyline::gpu::cache {
pipelineEntryIt.first->second.pipeline = pipelineFuture.share();
return CompiledPipeline{pipelineEntryIt.first->second};
}
void GraphicsPipelineCache::WaitIdle() {
pool.wait_for_tasks();
}
}

5
app/src/main/cpp/skyline/gpu/cache/graphics_pipeline_cache.h vendored
View File

@ -165,5 +165,10 @@ namespace skyline::gpu::cache {
* @note Input/Resolve attachments are **not** supported and using them with the supplied pipeline will result in UB
*/
CompiledPipeline GetCompiledPipeline(const PipelineState& state, span<const vk::DescriptorSetLayoutBinding> layoutBindings, span<const vk::PushConstantRange> pushConstantRanges = {}, bool noPushDescriptors = false);
/**
* @brief Waits until the pipeline compilation thread pool is idle and all pipelines have been compiled
*/
void WaitIdle();
};
}

4
app/src/main/cpp/skyline/gpu/interconnect/kepler_compute/pipeline_manager.cpp
View File

@ -90,6 +90,10 @@ namespace skyline::gpu::interconnect::kepler_compute {
.layout = *pipelineLayout,
};
if (ctx.gpu.traits.quirks.brokenMultithreadedPipelineCompilation)
ctx.gpu.graphicsPipelineCache.WaitIdle();
vk::raii::Pipeline pipeline{ctx.gpu.vkDevice, nullptr, pipelineInfo};
return Pipeline::CompiledPipeline{

4
app/src/main/cpp/skyline/gpu/trait_manager.cpp
View File

@ -227,6 +227,10 @@ namespace skyline::gpu {
if (deviceProperties.driverVersion < VK_MAKE_VERSION(512, 600, 0))
maxSubpassCount = 64; // Driver will segfault while destroying the renderpass and associated objects if this is exceeded on all 5xx and below drivers
if (deviceProperties.driverVersion >= VK_MAKE_VERSION(512, 615, 0) && deviceProperties.driverVersion <= VK_MAKE_VERSION(512, 615, 512))
brokenMultithreadedPipelineCompilation = true;
maxGlobalPriority = vk::QueueGlobalPriorityEXT::eHigh;
break;
}

1
app/src/main/cpp/skyline/gpu/trait_manager.h
View File

@ -65,6 +65,7 @@ namespace skyline::gpu {
bool brokenPushDescriptors{}; //!< [Adreno Proprietary] A bug that causes push descriptor updates to ignored by the driver in certain situations
bool brokenSpirvPositionInput{}; //!< [Adreno Proprietary] A bug that causes the shader compiler to fail on shaders with vertex position inputs not contained within a struct
bool brokenComputeShaders{}; //!< [ARM Proprietary] A bug that causes compute shaders in some games to crash the GPU
bool brokenMultithreadedPipelineCompilation{}; //!< [Qualcomm Proprietary] A bug that causes the shader compiler to crash when compiling pipelines on multiple threads simultaneously
u32 maxSubpassCount{std::numeric_limits<u32>::max()}; //!< The maximum amount of subpasses within a renderpass, this is limited to 64 on older Adreno proprietary drivers
vk::QueueGlobalPriorityEXT maxGlobalPriority{vk::QueueGlobalPriorityEXT::eMedium}; //!< The highest allowed global priority of the queue, drivers will not allow higher priorities to be set on queues