piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring and cleanup of GLInterface (now GLContext)

Browse Source
This commit is contained in:
Stenzek
2018-10-03 23:02:45 +10:00
parent 74b82bab3b
commit 134d967be2
39 changed files with 741 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
View File

@ -5,8 +5,8 @@
#include <sstream>
#include <unordered_map>
#include "Common/GL/GLContext.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/Logging/Log.h"
#if defined(__linux__) || defined(__APPLE__)
@ -2432,7 +2432,7 @@ static void InitVersion()
static void* GetFuncAddress(const std::string& name, void** func)
{
*func = GLInterface->GetFuncAddress(name);
*func = g_main_gl_context->GetFuncAddress(name);
if (*func == nullptr)
{
#if defined(__linux__) || defined(__APPLE__)
@ -2457,7 +2457,7 @@ bool Supports(const std::string& name)
bool Init()
{
_isES = GLInterface->GetMode() != GLInterfaceMode::MODE_OPENGL;
_isES = g_main_gl_context->GetMode() == GLContext::Mode::OpenGLES;
// Grab a few functions for initial checking
// We need them to grab the extension list
@ -2507,4 +2507,4 @@ bool InitFunctionPointers()
result &= !!GetFuncAddress(it.function_name, it.function_ptr);
return result;
}
}
} // namespace GLExtensions