diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-09-22 15:32:48 +0200 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-09-22 15:32:48 +0200 |
| commit | 3930c929cbd6d286c104333337f513ec0c91902c (patch) | |
| tree | 4fe7068fbf8b3c22cdafebd16b3a1ff573f4144b /Source/Core/VideoBackends/OGL/main.cpp | |
| parent | a537ca7543bb3b147a9fbb1c6f44083902848d2d (diff) | |
| parent | c9836ff59292855093ba5f7bdc47755ea74123a5 (diff) | |
Merge pull request #3062 from phire/moveGL
Move GL interface code out of the OpenGL video backend.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 1b4ae331b6..edeb569ec1 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -44,6 +44,8 @@ Make AA apply instantly during gameplay if possible #include "Common/CommonPaths.h" #include "Common/FileSearch.h" #include "Common/Thread.h" +#include "Common/GL/GLInterfaceBase.h" +#include "Common/GL/GLUtil.h" #include "Common/Logging/LogManager.h" #include "Core/ConfigManager.h" @@ -52,8 +54,6 @@ Make AA apply instantly during gameplay if possible #include "VideoBackends/OGL/BoundingBox.h" #include "VideoBackends/OGL/FramebufferManager.h" -#include "VideoBackends/OGL/GLInterfaceBase.h" -#include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/PerfQuery.h" #include "VideoBackends/OGL/PostProcessing.h" #include "VideoBackends/OGL/ProgramShaderCache.h" @@ -84,6 +84,12 @@ Make AA apply instantly during gameplay if possible namespace OGL { +// Draw messages on top of the screen +unsigned int VideoBackend::PeekMessages() +{ + return GLInterface->PeekMessages(); +} + std::string VideoBackend::GetName() const { return "OGL"; |