archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 02:38:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: Rework context handling and stop leaking the GL ccontext

Browse source 
- GL contexts are external handles that require manual lifecycle management
This commit is contained in:
kd-11 2017-11-03 20:43:11 +03:00
parent 4ca98e53a6
commit 75504b3f5e
7 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/rpcs3qt/gl_gs_frame.cpp
View file

@ -22,7 +22,7 @@ gl_gs_frame::gl_gs_frame(int w, int h, QIcon appIcon, bool disableMouse)
setFormat(m_format);
}
void* gl_gs_frame::make_context()
draw_context_t gl_gs_frame::make_context()
{
auto context = new QOpenGLContext();
context->setFormat(m_format);
@ -33,16 +33,18 @@ void* gl_gs_frame::make_context()
void gl_gs_frame::set_current(draw_context_t ctx)
{
if (!((QOpenGLContext*)ctx.get())->makeCurrent(this))
if (!((QOpenGLContext*)ctx)->makeCurrent(this))
{
create();
((QOpenGLContext*)ctx.get())->makeCurrent(this);
((QOpenGLContext*)ctx)->makeCurrent(this);
}
}
void gl_gs_frame::delete_context(void* ctx)
void gl_gs_frame::delete_context(draw_context_t ctx)
{
((QOpenGLContext*)ctx)->deleteLater();
auto gl_ctx = (QOpenGLContext*)ctx;
gl_ctx->doneCurrent();
delete gl_ctx;
}
void gl_gs_frame::flip(draw_context_t context, bool skip_frame)
@ -52,6 +54,6 @@ void gl_gs_frame::flip(draw_context_t context, bool skip_frame)
//Do not swap buffers if frame skip is active
if (skip_frame) return;
((QOpenGLContext*)context.get())->makeCurrent(this);
((QOpenGLContext*)context.get())->swapBuffers(this);
((QOpenGLContext*)context)->makeCurrent(this);
((QOpenGLContext*)context)->swapBuffers(this);
}