actual non hacky way to share OpenGL contexts
This commit is contained in:
parent
660d830135
commit
a6ab27de6b
|
@ -681,23 +681,23 @@ ScreenPanelGL::ScreenPanelGL(QWidget* parent) : ScreenPanel(parent)
|
|||
ScreenPanelGL::~ScreenPanelGL()
|
||||
{}
|
||||
|
||||
GL::Context* hax = nullptr;
|
||||
|
||||
bool ScreenPanelGL::createContext()
|
||||
{
|
||||
std::optional<WindowInfo> windowInfo = getWindowInfo();
|
||||
|
||||
if (hax)
|
||||
// if our parent window is parented to another window, we will
|
||||
// share our OpenGL context with that window
|
||||
MainWindow* parentwin = (MainWindow*)parentWidget()->parentWidget();
|
||||
if (parentwin)
|
||||
{
|
||||
if (windowInfo.has_value())
|
||||
{
|
||||
glContext = hax->CreateSharedContext(*getWindowInfo());
|
||||
glContext = parentwin->getOGLContext()->CreateSharedContext(*getWindowInfo());
|
||||
glContext->DoneCurrent();
|
||||
}
|
||||
|
||||
return glContext != nullptr;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
std::array<GL::Context::Version, 2> versionsToTry = {
|
||||
GL::Context::Version{GL::Context::Profile::Core, 4, 3},
|
||||
GL::Context::Version{GL::Context::Profile::Core, 3, 2}};
|
||||
|
@ -705,7 +705,7 @@ bool ScreenPanelGL::createContext()
|
|||
{
|
||||
glContext = GL::Context::Create(*getWindowInfo(), versionsToTry);
|
||||
glContext->DoneCurrent();
|
||||
hax = glContext.get();
|
||||
}
|
||||
}
|
||||
|
||||
return glContext != nullptr;
|
||||
|
|
|
@ -380,7 +380,7 @@ int main(int argc, char** argv)
|
|||
if (options->fullscreen)
|
||||
ToggleFullscreen(mainWindow);
|
||||
|
||||
MainWindow* poop = new MainWindow();
|
||||
MainWindow* poop = new MainWindow(mainWindow);
|
||||
|
||||
emuThread = new EmuThread();
|
||||
emuThread->attachWindow(mainWindow);
|
||||
|
|
Loading…
Reference in New Issue