diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2018-08-01 15:34:06 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2018-08-01 16:21:56 +0300 |
| commit | 0b7f3017fe6eeb25d14e22bac45271de4c53be01 (patch) | |
| tree | 42f797cf352b2ab450979ea0bafc563be6e73a7a /qt | |
| parent | bc461840fe7462cb6d55cd3f577824de07583e0c (diff) | |
Graphics context. Review fixes.
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/qt_common/qtoglcontextfactory.cpp | 4 | ||||
| -rw-r--r-- | qt/qt_common/qtoglcontextfactory.hpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qt/qt_common/qtoglcontextfactory.cpp b/qt/qt_common/qtoglcontextfactory.cpp index 525ad736e9..c47bff31ff 100644 --- a/qt/qt_common/qtoglcontextfactory.cpp +++ b/qt/qt_common/qtoglcontextfactory.cpp @@ -54,7 +54,7 @@ void QtOGLContextFactory::UnlockFrame() m_drawContext->UnlockFrame(); } -dp::GraphicContext * QtOGLContextFactory::GetDrawContext() +dp::GraphicsContext * QtOGLContextFactory::GetDrawContext() { if (!m_drawContext) m_drawContext = my::make_unique<QtRenderOGLContext>(m_rootContext, m_drawSurface.get()); @@ -62,7 +62,7 @@ dp::GraphicContext * QtOGLContextFactory::GetDrawContext() return m_drawContext.get(); } -dp::GraphicContext * QtOGLContextFactory::GetResourcesUploadContext() +dp::GraphicsContext * QtOGLContextFactory::GetResourcesUploadContext() { if (!m_uploadContext) m_uploadContext = my::make_unique<QtUploadOGLContext>(m_rootContext, m_uploadSurface.get()); diff --git a/qt/qt_common/qtoglcontextfactory.hpp b/qt/qt_common/qtoglcontextfactory.hpp index 209d556c33..c3e48e41ab 100644 --- a/qt/qt_common/qtoglcontextfactory.hpp +++ b/qt/qt_common/qtoglcontextfactory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "drape/graphic_context_factory.hpp" +#include "drape/graphics_context_factory.hpp" #include "qt/qt_common/qtoglcontext.hpp" #include <QtGui/QOpenGLContext> @@ -12,7 +12,7 @@ namespace qt { namespace common { -class QtOGLContextFactory : public dp::GraphicContextFactory +class QtOGLContextFactory : public dp::GraphicsContextFactory { public: QtOGLContextFactory(QOpenGLContext * rootContext); @@ -25,9 +25,9 @@ public: QRectF const & GetTexRect() const; void UnlockFrame(); - // dp::GraphicContextFactory overrides: - dp::GraphicContext * GetDrawContext() override; - dp::GraphicContext * GetResourcesUploadContext() override; + // dp::GraphicsContextFactory overrides: + dp::GraphicsContext * GetDrawContext() override; + dp::GraphicsContext * GetResourcesUploadContext() override; bool IsDrawContextCreated() const override { return m_drawContext != nullptr; } bool IsUploadContextCreated() const override { return m_uploadContext != nullptr; } |