Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-12 09:09:47 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a couple things

Browse source
This commit is contained in:
offtkp 2024-08-09 01:41:18 +03:00
parent 2849cc3798
commit 9a852475c5
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panda_qt/main_window.cpp
View file

@ -606,29 +606,29 @@ void MainWindow::pollControllers() {
namespace AsyncCompiler { namespace AsyncCompiler {
void* createContext(void* mainContext) { void* createContext(void* mainContext) {
GL::Context* glContext = static_cast<GL::Context*>(mainContext); GL::Context* glContext = (GL::Context*)mainContext;
// Unlike the SDL function, this doesn't make it current so we don't // Unlike the SDL function, this doesn't make it current so we don't
// need to call MakeCurrent on the mainContext // need to call MakeCurrent on the mainContext
WindowInfo wi = glContext->GetWindowInfo(); WindowInfo wi = glContext->GetWindowInfo();
wi.type = WindowInfo::Type::Surfaceless; wi.type = WindowInfo::Type::Surfaceless;
std::unique_ptr<GL::Context>* newContext = new std::unique_ptr<GL::Context>(glContext->CreateSharedContext(wi)); std::unique_ptr<GL::Context> iLoveBeingForcedToUseRAII = glContext->CreateSharedContext(wi);
if (newContext->get() == nullptr) { if (!iLoveBeingForcedToUseRAII) {
Helpers::panic("Failed to create shared GL context"); Helpers::panic("Failed to create shared GL context");
} }
return newContext; return iLoveBeingForcedToUseRAII.release();
} }
void makeCurrent(void* mainContext, void* context) { void makeCurrent(void* unused, void* context) {
std::unique_ptr<GL::Context>* glContext = static_cast<std::unique_ptr<GL::Context>*>(context); GL::Context* glContext = (GL::Context*)context;
(*glContext)->MakeCurrent(); glContext->MakeCurrent();
} }
void destroyContext(void* context) { void destroyContext(void* context) {
std::unique_ptr<GL::Context>* glContext = static_cast<std::unique_ptr<GL::Context>*>(context); GL::Context* glContext = (GL::Context*)context;
delete glContext; delete glContext;
} }
} // namespace AsyncCompiler } // namespace AsyncCompiler

1
third_party/duckstation/gl/context_egl_x11.cpp vendored
View file

@ -20,6 +20,7 @@ std::unique_ptr<Context> ContextEGLX11::CreateSharedContext(const WindowInfo& wi
{ {
std::unique_ptr<ContextEGLX11> context = std::make_unique<ContextEGLX11>(wi); std::unique_ptr<ContextEGLX11> context = std::make_unique<ContextEGLX11>(wi);
context->m_display = m_display; context->m_display = m_display;
context->m_supports_surfaceless = m_supports_surfaceless;
if (!context->CreateContextAndSurface(m_version, m_context, false)) if (!context->CreateContextAndSurface(m_version, m_context, false))
return nullptr; return nullptr;