Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Vulkan: Setup framebuf manager for restore.

Browse source
This commit is contained in:
Unknown W. Brackets 2016-10-09 11:09:30 -07:00
parent 31e46f0931
commit cac3e6582d
2 changed files with 68 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
GPU/Vulkan/FramebufferVulkan.cpp
View file

@ -94,6 +94,16 @@ FramebufferManagerVulkan::FramebufferManagerVulkan(VulkanContext *vulkan) :
pipelinePostShader_(VK_NULL_HANDLE), pipelinePostShader_(VK_NULL_HANDLE),
vulkan2D_(vulkan) { vulkan2D_(vulkan) {
InitDeviceObjects();
}
FramebufferManagerVulkan::~FramebufferManagerVulkan() {
delete[] convBuf_;
DestroyDeviceObjects();
}
void FramebufferManagerVulkan::InitDeviceObjects() {
// Create a bunch of render pass objects, for normal rendering with a depth buffer, // Create a bunch of render pass objects, for normal rendering with a depth buffer,
// with and without pre-clearing of both depth/stencil and color, so 4 combos. // with and without pre-clearing of both depth/stencil and color, so 4 combos.
VkAttachmentDescription attachments[2] = {}; VkAttachmentDescription attachments[2] = {};
@ -189,33 +199,61 @@ FramebufferManagerVulkan::FramebufferManagerVulkan(VulkanContext *vulkan) :
assert(res == VK_SUCCESS); assert(res == VK_SUCCESS);
} }
FramebufferManagerVulkan::~FramebufferManagerVulkan() { void FramebufferManagerVulkan::DestroyDeviceObjects() {
delete[] convBuf_; if (rpLoadColorLoadDepth_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteRenderPass(rpLoadColorLoadDepth_);
vulkan_->Delete().QueueDeleteRenderPass(rpLoadColorLoadDepth_); rpLoadColorLoadDepth_ = VK_NULL_HANDLE;
vulkan_->Delete().QueueDeleteRenderPass(rpClearColorLoadDepth_); if (rpClearColorLoadDepth_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteRenderPass(rpClearColorClearDepth_); vulkan_->Delete().QueueDeleteRenderPass(rpClearColorLoadDepth_);
vulkan_->Delete().QueueDeleteRenderPass(rpLoadColorClearDepth_); rpClearColorLoadDepth_ = VK_NULL_HANDLE;
if (rpClearColorClearDepth_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteRenderPass(rpClearColorClearDepth_);
rpClearColorClearDepth_ = VK_NULL_HANDLE;
if (rpLoadColorClearDepth_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteRenderPass(rpLoadColorClearDepth_);
rpLoadColorClearDepth_ = VK_NULL_HANDLE;
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (frameData_[i].numCommandBuffers_ > 0) { if (frameData_[i].numCommandBuffers_ > 0) {
vkFreeCommandBuffers(vulkan_->GetDevice(), frameData_[i].cmdPool_, frameData_[i].numCommandBuffers_, frameData_[i].commandBuffers_); vkFreeCommandBuffers(vulkan_->GetDevice(), frameData_[i].cmdPool_, frameData_[i].numCommandBuffers_, frameData_[i].commandBuffers_);
frameData_[i].numCommandBuffers_ = 0;
frameData_[i].totalCommandBuffers_ = 0;
}
if (frameData_[i].cmdPool_ != VK_NULL_HANDLE) {
vkDestroyCommandPool(vulkan_->GetDevice(), frameData_[i].cmdPool_, nullptr);
frameData_[i].cmdPool_ = VK_NULL_HANDLE;
}
if (frameData_[i].push_) {
frameData_[i].push_->Destroy(vulkan_);
delete frameData_[i].push_;
frameData_[i].push_ = nullptr;
} }
vkDestroyCommandPool(vulkan_->GetDevice(), frameData_[i].cmdPool_, nullptr);
frameData_[i].push_->Destroy(vulkan_);
delete frameData_[i].push_;
} }
delete drawPixelsTex_; delete drawPixelsTex_;
drawPixelsTex_ = nullptr;
vulkan_->Delete().QueueDeleteShaderModule(fsBasicTex_); if (fsBasicTex_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteShaderModule(vsBasicTex_); vulkan_->Delete().QueueDeleteShaderModule(fsBasicTex_);
fsBasicTex_ = VK_NULL_HANDLE;
if (vsBasicTex_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteShaderModule(vsBasicTex_);
vsBasicTex_ = VK_NULL_HANDLE;
vulkan_->Delete().QueueDeleteSampler(linearSampler_); if (linearSampler_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteSampler(nearestSampler_); vulkan_->Delete().QueueDeleteSampler(linearSampler_);
vulkan_->Delete().QueueDeletePipeline(pipelineBasicTex_); linearSampler_ = VK_NULL_HANDLE;
if (nearestSampler_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteSampler(nearestSampler_);
nearestSampler_ = VK_NULL_HANDLE;
if (pipelineBasicTex_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeletePipeline(pipelineBasicTex_);
pipelineBasicTex_ = VK_NULL_HANDLE;
if (pipelinePostShader_ != VK_NULL_HANDLE) if (pipelinePostShader_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeletePipeline(pipelinePostShader_); vulkan_->Delete().QueueDeletePipeline(pipelinePostShader_);
vulkan_->Delete().QueueDeletePipelineCache(pipelineCache2D_); pipelinePostShader_ = VK_NULL_HANDLE;
if (pipelineCache2D_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeletePipelineCache(pipelineCache2D_);
pipelineCache2D_ = VK_NULL_HANDLE;
} }
void FramebufferManagerVulkan::NotifyClear(bool clearColor, bool clearAlpha, bool clearDepth, uint32_t color, float depth) { void FramebufferManagerVulkan::NotifyClear(bool clearColor, bool clearAlpha, bool clearDepth, uint32_t color, float depth) {
@ -1515,7 +1553,17 @@ void FramebufferManagerVulkan::EndFrame() {
void FramebufferManagerVulkan::DeviceLost() { void FramebufferManagerVulkan::DeviceLost() {
DestroyAllFBOs(false); DestroyAllFBOs(false);
DestroyDeviceObjects();
resized_ = false; resized_ = false;
vulkan2D_.DeviceLost();
}
void FramebufferManagerVulkan::DeviceRestore(VulkanContext *vulkan) {
vulkan_ = vulkan;
vulkan2D_.DeviceRestore(vulkan_);
InitDeviceObjects();
} }
std::vector<FramebufferInfo> FramebufferManagerVulkan::GetFramebufferList() { std::vector<FramebufferInfo> FramebufferManagerVulkan::GetFramebufferList() {

4
GPU/Vulkan/FramebufferVulkan.h
View file

@ -104,6 +104,7 @@ public:
void Resized(); void Resized();
void DeviceLost(); void DeviceLost();
void DeviceRestore(VulkanContext *vulkan);
void CopyDisplayToOutput(); void CopyDisplayToOutput();
int GetLineWidth(); int GetLineWidth();
void ReformatFramebufferFrom(VirtualFramebuffer *vfb, GEBufferFormat old); void ReformatFramebufferFrom(VirtualFramebuffer *vfb, GEBufferFormat old);
@ -174,6 +175,9 @@ private:
void PackFramebufferAsync_(VirtualFramebuffer *vfb); void PackFramebufferAsync_(VirtualFramebuffer *vfb);
void PackFramebufferSync_(VirtualFramebuffer *vfb, int x, int y, int w, int h); void PackFramebufferSync_(VirtualFramebuffer *vfb, int x, int y, int w, int h);
void InitDeviceObjects();
void DestroyDeviceObjects();
VulkanContext *vulkan_; VulkanContext *vulkan_;
// The command buffer of the current framebuffer pass being rendered to. // The command buffer of the current framebuffer pass being rendered to.