From 045eec282aea0269074a7cf95520fa4e9c18e195 Mon Sep 17 00:00:00 2001 From: James Rowe Date: Mon, 16 Sep 2019 23:29:21 -0600 Subject: [PATCH] rename GGLContext to just GLContext --- src/citra_qt/bootmanager.cpp | 8 ++++---- src/citra_qt/bootmanager.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index c51c828ab..bfbd465f6 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -305,10 +305,10 @@ void GRenderWindow::showEvent(QShowEvent* event) { } std::unique_ptr GRenderWindow::CreateSharedContext() const { - return std::make_unique(QOpenGLContext::globalShareContext()); + return std::make_unique(QOpenGLContext::globalShareContext()); } -GGLContext::GGLContext(QOpenGLContext* shared_context) +GLContext::GLContext(QOpenGLContext* shared_context) : context(new QOpenGLContext(shared_context->parent())), surface(new QOffscreenSurface(nullptr)) { context->setShareContext(shared_context); @@ -318,10 +318,10 @@ GGLContext::GGLContext(QOpenGLContext* shared_context) surface->create(); } -void GGLContext::MakeCurrent() { +void GLContext::MakeCurrent() { context->makeCurrent(surface); } -void GGLContext::DoneCurrent() { +void GLContext::DoneCurrent() { context->doneCurrent(); } diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index 4edb96d72..bd01d7838 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -22,9 +22,9 @@ class QOpenGLContext; class GMainWindow; class GRenderWindow; -class GGLContext : public Frontend::GraphicsContext { +class GLContext : public Frontend::GraphicsContext { public: - explicit GGLContext(QOpenGLContext* shared_context); + explicit GLContext(QOpenGLContext* shared_context); void MakeCurrent() override;