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

Fix a few more device-loss bugs.

Browse source
This commit is contained in:
Henrik Rydgård 2017-11-10 15:10:36 +01:00
parent 1c76d28843
commit 378e01625c
4 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GPU/Vulkan/DrawEngineVulkan.cpp
View file

@ -251,10 +251,8 @@ void DrawEngineVulkan::DestroyDeviceObjects() {
vulkan_->Delete().QueueDeleteSampler(nullSampler_); vulkan_->Delete().QueueDeleteSampler(nullSampler_);
if (pipelineLayout_ != VK_NULL_HANDLE) if (pipelineLayout_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeletePipelineLayout(pipelineLayout_); vulkan_->Delete().QueueDeletePipelineLayout(pipelineLayout_);
pipelineLayout_ = VK_NULL_HANDLE;
if (descriptorSetLayout_ != VK_NULL_HANDLE) if (descriptorSetLayout_ != VK_NULL_HANDLE)
vulkan_->Delete().QueueDeleteDescriptorSetLayout(descriptorSetLayout_); vulkan_->Delete().QueueDeleteDescriptorSetLayout(descriptorSetLayout_);
descriptorSetLayout_ = VK_NULL_HANDLE;
if (nullTexture_) { if (nullTexture_) {
nullTexture_->Destroy(); nullTexture_->Destroy();
delete nullTexture_; delete nullTexture_;
@ -263,6 +261,7 @@ void DrawEngineVulkan::DestroyDeviceObjects() {
vertexCache_->Destroy(vulkan_); vertexCache_->Destroy(vulkan_);
delete vertexCache_; delete vertexCache_;
vertexCache_ = nullptr; vertexCache_ = nullptr;
vai_.Clear(); // Need to clear this to get rid of all remaining references to the dead buffers.
} }
void DrawEngineVulkan::DeviceLost() { void DrawEngineVulkan::DeviceLost() {

2
GPU/Vulkan/GPU_Vulkan.h
View file

@ -119,8 +119,6 @@ private:
// Manages state and pipeline objects // Manages state and pipeline objects
PipelineManagerVulkan *pipelineManager_; PipelineManagerVulkan *pipelineManager_;
int lastVsync_;
VkCommandBuffer curCmd_;
int vertexCost_ = 0; int vertexCost_ = 0;
std::string reportingPrimaryInfo_; std::string reportingPrimaryInfo_;

6
UI/NativeApp.cpp
View file

@ -845,6 +845,12 @@ void NativeRender(GraphicsContext *graphicsContext) {
graphicsContext->Resize(); graphicsContext->Resize();
screenManager->resized(); screenManager->resized();
// Do not enable unless you are testing device-loss on Windows
#if 0
screenManager->deviceLost();
screenManager->deviceRestore();
#endif
// TODO: Move this to new GraphicsContext objects for each backend. // TODO: Move this to new GraphicsContext objects for each backend.
#ifndef _WIN32 #ifndef _WIN32
if (GetGPUBackend() == GPUBackend::OPENGL) { if (GetGPUBackend() == GPUBackend::OPENGL) {

26
ext/native/thin3d/VulkanRenderManager.cpp
View file

@ -194,7 +194,7 @@ void VulkanRenderManager::CreateBackbuffers() {
run_ = true; run_ = true;
// Won't necessarily be 0. // Won't necessarily be 0.
threadInitFrame_ = vulkan_->GetCurFrame(); threadInitFrame_ = vulkan_->GetCurFrame();
ILOG("Starting Vulkan submission thread"); ILOG("Starting Vulkan submission thread (threadInitFrame_ = %d)", vulkan_->GetCurFrame());
thread_ = std::thread(&VulkanRenderManager::ThreadFunc, this); thread_ = std::thread(&VulkanRenderManager::ThreadFunc, this);
} }
} }
@ -215,12 +215,21 @@ void VulkanRenderManager::StopThread() {
} }
} }
thread_.join(); thread_.join();
ILOG("Vulkan submission thread joined."); ILOG("Vulkan submission thread joined. Frame=%d", vulkan_->GetCurFrame());
// Eat whatever has been queued up for this frame if anything.
Wipe();
// Wait for any fences to finish and be resignaled, so we don't have sync issues. // Wait for any fences to finish and be resignaled, so we don't have sync issues.
// Also clean out any queued data, which might refer to things that might not be valid
// when we restart...
for (int i = 0; i < vulkan_->GetInflightFrames(); i++) { for (int i = 0; i < vulkan_->GetInflightFrames(); i++) {
auto &frameData = frameData_[i]; auto &frameData = frameData_[i];
if (frameData.readyForRun || frameData.hasInitCommands || frameData.steps.size() != 0) {
Crash();
}
frameData.readyForRun = false; frameData.readyForRun = false;
frameData.steps.clear();
std::unique_lock<std::mutex> lock(frameData.push_mutex); std::unique_lock<std::mutex> lock(frameData.push_mutex);
while (!frameData.readyForFence) { while (!frameData.readyForFence) {
@ -277,6 +286,7 @@ void VulkanRenderManager::ThreadFunc() {
setCurrentThreadName("RenderMan"); setCurrentThreadName("RenderMan");
int threadFrame = threadInitFrame_; int threadFrame = threadInitFrame_;
bool nextFrame = false; bool nextFrame = false;
bool firstFrame = true;
while (true) { while (true) {
{ {
if (nextFrame) { if (nextFrame) {
@ -304,9 +314,17 @@ void VulkanRenderManager::ThreadFunc() {
assert(frameData.type == VKRRunType::END || frameData.type == VKRRunType::SYNC); assert(frameData.type == VKRRunType::END || frameData.type == VKRRunType::SYNC);
} }
VLOG("PULL: Running frame %d", threadFrame); VLOG("PULL: Running frame %d", threadFrame);
if (firstFrame) {
ILOG("Running first frame (%d)", threadFrame);
firstFrame = false;
}
Run(threadFrame); Run(threadFrame);
VLOG("PULL: Finished frame %d", threadFrame); VLOG("PULL: Finished frame %d", threadFrame);
} }
// Wait for the device to be done with everything, before tearing stuff down.
vkDeviceWaitIdle(vulkan_->GetDevice());
VLOG("PULL: Quitting"); VLOG("PULL: Quitting");
} }
@ -374,9 +392,7 @@ void VulkanRenderManager::BindFramebufferAsRenderTarget(VKRFramebuffer *fb, VKRR
curRenderStep_ = nullptr; curRenderStep_ = nullptr;
} }
if (curRenderStep_ && curRenderStep_->commands.size() == 0) { if (curRenderStep_ && curRenderStep_->commands.size() == 0) {
#ifdef _DEBUG VLOG("Empty render step. Usually happens after uploading pixels..");
ILOG("Empty render step. Usually happens after uploading pixels..");
#endif
} }
VKRStep *step = new VKRStep{ VKRStepType::RENDER }; VKRStep *step = new VKRStep{ VKRStepType::RENDER };