mirror of
https://github.com/cemu-project/Cemu.git
synced 2025-07-09 16:31:19 +12:00
Merge branch 'main' into metal
This commit is contained in:
commit
2f9ef596d2
18 changed files with 202 additions and 130 deletions
|
@ -137,8 +137,8 @@ class VulkanRenderer : public Renderer
|
|||
public:
|
||||
|
||||
// memory management
|
||||
VKRMemoryManager* memoryManager{};
|
||||
VKRMemoryManager* GetMemoryManager() const { return memoryManager; };
|
||||
std::unique_ptr<VKRMemoryManager> memoryManager;
|
||||
VKRMemoryManager* GetMemoryManager() const { return memoryManager.get(); };
|
||||
|
||||
VkSupportedFormatInfo_t m_supportedFormatInfo;
|
||||
|
||||
|
@ -584,6 +584,8 @@ private:
|
|||
std::shared_mutex m_pipeline_cache_save_mutex;
|
||||
std::thread m_pipeline_cache_save_thread;
|
||||
VkPipelineCache m_pipeline_cache{ nullptr };
|
||||
std::unordered_map<uint64, VkPipeline> m_backbufferBlitPipelineCache;
|
||||
std::unordered_map<uint64, VkDescriptorSet> m_backbufferBlitDescriptorSetCache;
|
||||
VkPipelineLayout m_pipelineLayout{nullptr};
|
||||
VkCommandPool m_commandPool{ nullptr };
|
||||
|
||||
|
@ -861,7 +863,7 @@ private:
|
|||
memBarrier.pNext = nullptr;
|
||||
|
||||
VkPipelineStageFlags srcStages = VK_PIPELINE_STAGE_TRANSFER_BIT;
|
||||
VkPipelineStageFlags dstStages = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
|
||||
VkPipelineStageFlags dstStages = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
|
||||
|
||||
memBarrier.srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT;
|
||||
memBarrier.dstAccessMask = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue