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

Revert "OpenGL: Separate submit/present for this backend as well"

Browse source 
This reverts commit 0143d67f9b.
This commit is contained in:
Henrik Rydgård 2023-08-12 13:35:21 +02:00
parent fabcaf6e04
commit 0ccd29f2ba
4 changed files with 39 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
Common/GPU/OpenGL/GLRenderManager.cpp
View file

@ -377,7 +377,7 @@ void GLRenderManager::Finish() {
frameData_[curFrame].deleter.Take(deleter_);
VLOG("PUSH: Finish, pushing task. curFrame = %d", curFrame);
GLRRenderThreadTask *task = new GLRRenderThreadTask(GLRRunType::SUBMIT);
GLRRenderThreadTask *task = new GLRRenderThreadTask(GLRRunType::PRESENT);
task->frame = curFrame;
{
@ -414,56 +414,10 @@ void GLRenderManager::Finish() {
insideFrame_ = false;
}
void GLRenderManager::Present() {
int curFrame = GetCurFrame();
GLRRenderThreadTask *task = new GLRRenderThreadTask(GLRRunType::PRESENT);
task->frame = curFrame;
std::unique_lock<std::mutex> lock(pushMutex_);
renderThreadQueue_.push(task);
}
// Render thread. Returns true if the caller should handle a swap.
bool GLRenderManager::Run(GLRRenderThreadTask &task) {
GLFrameData &frameData = frameData_[task.frame];
if (task.runType == GLRRunType::PRESENT) {
bool swapRequest = false;
if (!frameData.skipSwap) {
if (swapIntervalChanged_) {
swapIntervalChanged_ = false;
if (swapIntervalFunction_) {
swapIntervalFunction_(swapInterval_);
}
}
// This is the swapchain framebuffer flip.
if (swapFunction_) {
VLOG(" PULL: SwapFunction()");
swapFunction_();
if (!retainControl_) {
// get out of here.
swapRequest = true;
}
} else {
VLOG(" PULL: SwapRequested");
swapRequest = true;
}
} else {
frameData.skipSwap = false;
}
frameData.hasBegun = false;
VLOG(" PULL: Frame %d.readyForFence = true", task.frame);
{
std::lock_guard<std::mutex> lock(frameData.fenceMutex);
frameData.readyForFence = true;
frameData.fenceCondVar.notify_one();
// At this point, we're done with this framedata (for now).
}
return swapRequest;
}
if (!frameData.hasBegun) {
frameData.hasBegun = true;
@ -507,8 +461,43 @@ bool GLRenderManager::Run(GLRRenderThreadTask &task) {
}
}
bool swapRequest = false;
switch (task.runType) {
case GLRRunType::SUBMIT:
case GLRRunType::PRESENT:
if (!frameData.skipSwap) {
if (swapIntervalChanged_) {
swapIntervalChanged_ = false;
if (swapIntervalFunction_) {
swapIntervalFunction_(swapInterval_);
}
}
// This is the swapchain framebuffer flip.
if (swapFunction_) {
VLOG(" PULL: SwapFunction()");
swapFunction_();
if (!retainControl_) {
// get out of here.
swapRequest = true;
}
} else {
VLOG(" PULL: SwapRequested");
swapRequest = true;
}
} else {
frameData.skipSwap = false;
}
frameData.hasBegun = false;
VLOG(" PULL: Frame %d.readyForFence = true", task.frame);
{
std::lock_guard<std::mutex> lock(frameData.fenceMutex);
frameData.readyForFence = true;
frameData.fenceCondVar.notify_one();
// At this point, we're done with this framedata (for now).
}
break;
case GLRRunType::SYNC:
@ -527,7 +516,7 @@ bool GLRenderManager::Run(GLRRenderThreadTask &task) {
_assert_(false);
}
VLOG(" PULL: ::Run(): Done running tasks");
return false;
return swapRequest;
}
void GLRenderManager::FlushSync() {

4
Common/GPU/OpenGL/GLRenderManager.h
View file

@ -198,7 +198,6 @@ public:
};
enum class GLRRunType {
SUBMIT,
PRESENT,
SYNC,
EXIT,
@ -254,8 +253,7 @@ 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 Present();
void Finish();
// 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,7 +803,6 @@ void OpenGLContext::EndFrame() {
}
void OpenGLContext::Present(int vblanks) {
renderManager_.Present();
frameCount_++;
}

1
libretro/libretro.cpp
View file

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