Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Finish the separation of EndFrame and Present.

Browse Source
This commit is contained in:
Henrik Rydgård 2023-08-13 18:27:32 +02:00
parent 377704f195
commit e651d6e59f
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Common/GPU/OpenGL/GLRenderManager.cpp
View File

@ -184,7 +184,7 @@ void GLRenderManager::StopThread() {
}
std::string GLRenderManager::GetGpuProfileString() const {
int curFrame = GetCurFrame();
int curFrame = curFrame_;
const GLQueueProfileContext &profile = frameData_[curFrame].profile;
float cputime_ms = 1000.0f * (profile.cpuEndTime - profile.cpuStartTime);
@ -372,29 +372,11 @@ void GLRenderManager::BeginFrame(bool enableProfiling) {
void GLRenderManager::Finish() {
curRenderStep_ = nullptr; // EndCurRenderStep is this simple here.
int curFrame = GetCurFrame();
int curFrame = curFrame_;
GLFrameData &frameData = frameData_[curFrame];
frameData_[curFrame].deleter.Take(deleter_);
VLOG("PUSH: Finish, pushing task. curFrame = %d", curFrame);
GLRRenderThreadTask *task = new GLRRenderThreadTask(GLRRunType::SUBMIT);
task->frame = curFrame;
{
std::unique_lock<std::mutex> lock(pushMutex_);
renderThreadQueue_.push(task);
renderThreadQueue_.back()->initSteps = std::move(initSteps_);
renderThreadQueue_.back()->steps = std::move(steps_);
initSteps_.clear();
steps_.clear();
GLRRenderThreadTask *presentTask = new GLRRenderThreadTask(GLRRunType::PRESENT);
presentTask->frame = curFrame;
renderThreadQueue_.push(presentTask);
pushCondVar_.notify_one();
}
if (frameData.profile.enabled) {
profilePassesString_ = std::move(frameData.profile.passesString);
@ -412,9 +394,33 @@ void GLRenderManager::Finish() {
frameData.profile.passesString.clear();
}
curFrame_++;
if (curFrame_ >= inflightFrames_)
curFrame_ = 0;
VLOG("PUSH: Finish, pushing task. curFrame = %d", curFrame);
GLRRenderThreadTask *task = new GLRRenderThreadTask(GLRRunType::SUBMIT);
task->frame = curFrame;
{
std::unique_lock<std::mutex> lock(pushMutex_);
renderThreadQueue_.push(task);
renderThreadQueue_.back()->initSteps = std::move(initSteps_);
renderThreadQueue_.back()->steps = std::move(steps_);
initSteps_.clear();
steps_.clear();
pushCondVar_.notify_one();
}
}
void GLRenderManager::Present() {
GLRRenderThreadTask *presentTask = new GLRRenderThreadTask(GLRRunType::PRESENT);
presentTask->frame = curFrame_;
{
std::unique_lock<std::mutex> lock(pushMutex_);
renderThreadQueue_.push(presentTask);
}
int newCurFrame = curFrame_ + 1;
if (newCurFrame >= inflightFrames_) {
newCurFrame = 0;
}
curFrame_ = newCurFrame;
insideFrame_ = false;
}

3
Common/GPU/OpenGL/GLRenderManager.h
View File

@ -254,7 +254,8 @@ public:
// Makes sure that the GPU has caught up enough that we can start writing buffers of this frame again.
void BeginFrame(bool enableProfiling);
// Can run on a different thread!
void Finish();
void Finish();
void Present();
// Creation commands. These were not needed in Vulkan since there we can do that on the main thread.
// We pass in width/height here even though it's not strictly needed until we support glTextureStorage

1
Common/GPU/OpenGL/thin3d_gl.cpp
View File

@ -803,6 +803,7 @@ void OpenGLContext::EndFrame() {
}
void OpenGLContext::Present(int vblanks) {
renderManager_.Present();
frameCount_++;
}

1
libretro/libretro.cpp
View File

@ -1174,6 +1174,7 @@ namespace Libretro
if (ctx->GetDrawContext()) {
ctx->GetDrawContext()->EndFrame();
ctx->GetDrawContext()->Present(1);
}
}