mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-26 09:41:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLContext: Remove global context pointer

Browse Source
This commit is contained in:
Stenzek 2018-10-03 23:03:26 +10:00
parent eb284b5d66
commit dcdd02d646
19 changed files with 183 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/GL/GLContext.cpp
View File

@ -23,8 +23,6 @@
#error Platform doesnt have a GLInterface #error Platform doesnt have a GLInterface
#endif #endif
std::unique_ptr<GLContext> g_main_gl_context;
GLContext::~GLContext() = default; GLContext::~GLContext() = default;
bool GLContext::Initialize(void* display_handle, void* window_handle, bool stereo, bool core) bool GLContext::Initialize(void* display_handle, void* window_handle, bool stereo, bool core)

2
Source/Core/Common/GL/GLContext.h
View File

@ -60,5 +60,3 @@ protected:
bool m_is_core_context = false; bool m_is_core_context = false;
bool m_is_shared = false; bool m_is_shared = false;
}; };
extern std::unique_ptr<GLContext> g_main_gl_context;

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

@ -2148,12 +2148,11 @@ const GLFunc gl_function_array[] = {
namespace GLExtensions namespace GLExtensions
{ {
// Private members and functions // Private members and functions
static bool _isES; static u32 s_gl_version;
static u32 _GLVersion; static std::unordered_map<std::string, bool> s_extension_list;
static std::unordered_map<std::string, bool> m_extension_list;
// Private initialization functions // Private initialization functions
bool InitFunctionPointers(); bool InitFunctionPointers(GLContext* context);
// Initializes the extension list the old way // Initializes the extension list the old way
static void InitExtensionList21() static void InitExtensionList21()
@ -2163,28 +2162,28 @@ static void InitExtensionList21()
std::istringstream buffer(tmp); std::istringstream buffer(tmp);
while (buffer >> tmp) while (buffer >> tmp)
m_extension_list[tmp] = true; s_extension_list[tmp] = true;
} }
static void InitExtensionList() static void InitExtensionList(GLContext* context)
{ {
m_extension_list.clear(); s_extension_list.clear();
if (_isES) if (context->IsGLES())
{ {
switch (_GLVersion) switch (s_gl_version)
{ {
default: default:
case 320: case 320:
m_extension_list["VERSION_GLES_3_2"] = true; s_extension_list["VERSION_GLES_3_2"] = true;
case 310: case 310:
m_extension_list["VERSION_GLES_3_1"] = true; s_extension_list["VERSION_GLES_3_1"] = true;
case 300: case 300:
m_extension_list["VERSION_GLES_3"] = true; s_extension_list["VERSION_GLES_3"] = true;
break; break;
} }
// We always have ES 2.0 // We always have ES 2.0
m_extension_list["VERSION_GLES_2"] = true; s_extension_list["VERSION_GLES_2"] = true;
} }
else else
{ {
@ -2194,7 +2193,7 @@ static void InitExtensionList()
// When an extension got merged in to core, the naming may have changed // When an extension got merged in to core, the naming may have changed
// This has intentional fall through // This has intentional fall through
switch (_GLVersion) switch (s_gl_version)
{ {
default: default:
case 450: case 450:
@ -2213,7 +2212,7 @@ static void InitExtensionList()
"VERSION_4_5", "VERSION_4_5",
}; };
for (auto it : gl450exts) for (auto it : gl450exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 440: case 440:
{ {
@ -2229,7 +2228,7 @@ static void InitExtensionList()
"VERSION_4_4", "VERSION_4_4",
}; };
for (auto it : gl440exts) for (auto it : gl440exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 430: case 430:
{ {
@ -2257,7 +2256,7 @@ static void InitExtensionList()
"VERSION_4_3", "VERSION_4_3",
}; };
for (auto it : gl430exts) for (auto it : gl430exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 420: case 420:
{ {
@ -2277,7 +2276,7 @@ static void InitExtensionList()
"VERSION_4_2", "VERSION_4_2",
}; };
for (auto it : gl420exts) for (auto it : gl420exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 410: case 410:
{ {
@ -2291,7 +2290,7 @@ static void InitExtensionList()
"VERSION_4_1", "VERSION_4_1",
}; };
for (auto it : gl410exts) for (auto it : gl410exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 400: case 400:
{ {
@ -2311,7 +2310,7 @@ static void InitExtensionList()
"VERSION_4_0", "VERSION_4_0",
}; };
for (auto it : gl400exts) for (auto it : gl400exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 330: case 330:
{ {
@ -2329,7 +2328,7 @@ static void InitExtensionList()
"VERSION_3_3", "VERSION_3_3",
}; };
for (auto it : gl330exts) for (auto it : gl330exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 320: case 320:
{ {
@ -2346,7 +2345,7 @@ static void InitExtensionList()
"VERSION_3_2", "VERSION_3_2",
}; };
for (auto it : gl320exts) for (auto it : gl320exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 310: case 310:
{ {
@ -2361,7 +2360,7 @@ static void InitExtensionList()
"VERSION_3_1", "VERSION_3_1",
}; };
for (auto it : gl310exts) for (auto it : gl310exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 300: case 300:
{ {
@ -2392,7 +2391,7 @@ static void InitExtensionList()
"VERSION_3_0", "VERSION_3_0",
}; };
for (auto it : gl300exts) for (auto it : gl300exts)
m_extension_list[it] = true; s_extension_list[it] = true;
} }
case 210: case 210:
case 200: case 200:
@ -2406,10 +2405,10 @@ static void InitExtensionList()
break; break;
} }
// So we can easily determine if we are running dekstop GL // So we can easily determine if we are running dekstop GL
m_extension_list["VERSION_GL"] = true; s_extension_list["VERSION_GL"] = true;
} }
if (_GLVersion < 300) if (s_gl_version < 300)
{ {
InitExtensionList21(); InitExtensionList21();
return; return;
@ -2417,7 +2416,7 @@ static void InitExtensionList()
GLint NumExtension = 0; GLint NumExtension = 0;
glGetIntegerv(GL_NUM_EXTENSIONS, &NumExtension); glGetIntegerv(GL_NUM_EXTENSIONS, &NumExtension);
for (GLint i = 0; i < NumExtension; ++i) for (GLint i = 0; i < NumExtension; ++i)
m_extension_list[std::string((const char*)glGetStringi(GL_EXTENSIONS, i))] = true; s_extension_list[std::string((const char*)glGetStringi(GL_EXTENSIONS, i))] = true;
} }
static void InitVersion() static void InitVersion()
{ {
@ -2425,14 +2424,14 @@ static void InitVersion()
glGetIntegerv(GL_MAJOR_VERSION, &major); glGetIntegerv(GL_MAJOR_VERSION, &major);
glGetIntegerv(GL_MINOR_VERSION, &minor); glGetIntegerv(GL_MINOR_VERSION, &minor);
if (glGetError() == GL_NO_ERROR) if (glGetError() == GL_NO_ERROR)
_GLVersion = major * 100 + minor * 10; s_gl_version = major * 100 + minor * 10;
else else
_GLVersion = 210; s_gl_version = 210;
} }
static void* GetFuncAddress(const std::string& name, void** func) static void* GetFuncAddress(GLContext* context, const std::string& name, void** func)
{ {
*func = g_main_gl_context->GetFuncAddress(name); *func = context->GetFuncAddress(name);
if (*func == nullptr) if (*func == nullptr)
{ {
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
@ -2448,37 +2447,36 @@ static void* GetFuncAddress(const std::string& name, void** func)
// Public members // Public members
u32 Version() u32 Version()
{ {
return _GLVersion; return s_gl_version;
} }
bool Supports(const std::string& name) bool Supports(const std::string& name)
{ {
return m_extension_list[name]; return s_extension_list[name];
} }
bool Init() bool Init(GLContext* context)
{ {
_isES = g_main_gl_context->GetMode() == GLContext::Mode::OpenGLES;
// Grab a few functions for initial checking // Grab a few functions for initial checking
// We need them to grab the extension list // We need them to grab the extension list
// Also to check if there is an error grabbing the version // Also to check if there is an error grabbing the version
if (GetFuncAddress("glGetIntegerv", (void**)&glGetIntegerv) == nullptr) if (GetFuncAddress(context, "glGetIntegerv", (void**)&glGetIntegerv) == nullptr)
return false; return false;
if (GetFuncAddress("glGetString", (void**)&glGetString) == nullptr) if (GetFuncAddress(context, "glGetString", (void**)&glGetString) == nullptr)
return false; return false;
if (GetFuncAddress("glGetError", (void**)&glGetError) == nullptr) if (GetFuncAddress(context, "glGetError", (void**)&glGetError) == nullptr)
return false; return false;
InitVersion(); InitVersion();
// We need to use glGetStringi to get the extension list // We need to use glGetStringi to get the extension list
// if we are using GLES3 or a GL version greater than 2.1 // if we are using GLES3 or a GL version greater than 2.1
if (_GLVersion > 210 && GetFuncAddress("glGetStringi", (void**)&glGetStringi) == nullptr) if (s_gl_version > 210 &&
GetFuncAddress(context, "glGetStringi", (void**)&glGetStringi) == nullptr)
return false; return false;
InitExtensionList(); InitExtensionList(context);
return InitFunctionPointers(); return InitFunctionPointers(context);
} }
// Private initialization functions // Private initialization functions
@ -2491,20 +2489,20 @@ static bool HasFeatures(const std::string& extensions)
while (buffer >> tmp) while (buffer >> tmp)
{ {
if (tmp[0] == '!') if (tmp[0] == '!')
result &= !m_extension_list[tmp.erase(0, 1)]; result &= !s_extension_list[tmp.erase(0, 1)];
else if (tmp[0] == '|') else if (tmp[0] == '|')
result |= m_extension_list[tmp.erase(0, 1)]; result |= s_extension_list[tmp.erase(0, 1)];
else else
result &= m_extension_list[tmp]; result &= s_extension_list[tmp];
} }
return result; return result;
} }
bool InitFunctionPointers() bool InitFunctionPointers(GLContext* context)
{ {
bool result = true; bool result = true;
for (const auto& it : gl_function_array) for (const auto& it : gl_function_array)
if (HasFeatures(it.requirements)) if (HasFeatures(it.requirements))
result &= !!GetFuncAddress(it.function_name, it.function_ptr); result &= !!GetFuncAddress(context, it.function_name, it.function_ptr);
return result; return result;
} }
} // namespace GLExtensions } // namespace GLExtensions

6
Source/Core/Common/GL/GLExtensions/GLExtensions.h
View File

@ -54,10 +54,12 @@
#include "Common/GL/GLExtensions/gl_4_4.h" #include "Common/GL/GLExtensions/gl_4_4.h"
#include "Common/GL/GLExtensions/gl_4_5.h" #include "Common/GL/GLExtensions/gl_4_5.h"
class GLContext;
namespace GLExtensions namespace GLExtensions
{ {
// Initializes the interface // Initializes the interface
bool Init(); bool Init(GLContext* context);
// Function for checking if the hardware supports an extension // Function for checking if the hardware supports an extension
// example: if (GLExtensions::Supports("GL_ARB_multi_map")) // example: if (GLExtensions::Supports("GL_ARB_multi_map"))
@ -65,4 +67,4 @@ bool Supports(const std::string& name);
// Returns OpenGL version in format 430 // Returns OpenGL version in format 430
u32 Version(); u32 Version();
} } // namespace GLExtensions

4
Source/Core/Common/GL/GLUtil.cpp
View File

@ -96,11 +96,11 @@ GLuint CompileProgram(const std::string& vertexShader, const std::string& fragme
return programID; return programID;
} }
void EnablePrimitiveRestart() void EnablePrimitiveRestart(const GLContext* context)
{ {
constexpr GLuint PRIMITIVE_RESTART_INDEX = 65535; constexpr GLuint PRIMITIVE_RESTART_INDEX = 65535;
if (g_main_gl_context->GetMode() == GLContext::Mode::OpenGLES) if (context->IsGLES())
{ {
glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX);
} }

4
Source/Core/Common/GL/GLUtil.h
View File

@ -8,8 +8,10 @@
#include "Common/GL/GLExtensions/GLExtensions.h" #include "Common/GL/GLExtensions/GLExtensions.h"
class GLContext;
namespace GLUtil namespace GLUtil
{ {
GLuint CompileProgram(const std::string& vertexShader, const std::string& fragmentShader); GLuint CompileProgram(const std::string& vertexShader, const std::string& fragmentShader);
void EnablePrimitiveRestart(); void EnablePrimitiveRestart(const GLContext* context);
} // namespace GLUtil } // namespace GLUtil

3
Source/Core/VideoBackends/OGL/FramebufferManager.cpp
View File

@ -9,7 +9,6 @@
#include "Common/Common.h" #include "Common/Common.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/GL/GLContext.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
@ -414,7 +413,7 @@ FramebufferManager::FramebufferManager(int targetWidth, int targetHeight, int ms
glBindBuffer(GL_ARRAY_BUFFER, glBindBuffer(GL_ARRAY_BUFFER,
static_cast<VertexManager*>(g_vertex_manager.get())->GetVertexBufferHandle()); static_cast<VertexManager*>(g_vertex_manager.get())->GetVertexBufferHandle());
if (!g_main_gl_context->IsGLES()) if (!static_cast<Renderer*>(g_renderer.get())->IsGLES())
glEnable(GL_PROGRAM_POINT_SIZE); glEnable(GL_PROGRAM_POINT_SIZE);
} }

15
Source/Core/VideoBackends/OGL/PerfQuery.cpp
View File

@ -6,24 +6,23 @@
#include "Common/CommonFuncs.h" #include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/GL/GLContext.h" #include "Common/GL/GLExtensions/GLExtensions.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/PerfQuery.h" #include "VideoBackends/OGL/PerfQuery.h"
#include "VideoCommon/RenderBase.h" #include "VideoBackends/OGL/Render.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
namespace OGL namespace OGL
{ {
std::unique_ptr<PerfQueryBase> GetPerfQuery() std::unique_ptr<PerfQueryBase> GetPerfQuery()
{ {
if (g_main_gl_context->IsGLES() && GLExtensions::Supports("GL_NV_occlusion_query_samples")) const bool is_gles = static_cast<Renderer*>(g_renderer.get())->IsGLES();
if (is_gles && GLExtensions::Supports("GL_NV_occlusion_query_samples"))
return std::make_unique<PerfQueryGLESNV>(); return std::make_unique<PerfQueryGLESNV>();
else if (is_gles)
if (g_main_gl_context->IsGLES())
return std::make_unique<PerfQueryGL>(GL_ANY_SAMPLES_PASSED); return std::make_unique<PerfQueryGL>(GL_ANY_SAMPLES_PASSED);
else
return std::make_unique<PerfQueryGL>(GL_SAMPLES_PASSED); return std::make_unique<PerfQueryGL>(GL_SAMPLES_PASSED);
} }
PerfQuery::PerfQuery() : m_query_read_pos() PerfQuery::PerfQuery() : m_query_read_pos()

5
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -805,7 +805,8 @@ void ProgramShaderCache::CreateHeader()
bool SharedContextAsyncShaderCompiler::WorkerThreadInitMainThread(void** param) bool SharedContextAsyncShaderCompiler::WorkerThreadInitMainThread(void** param)
{ {
std::unique_ptr<GLContext> context = g_main_gl_context->CreateSharedContext(); std::unique_ptr<GLContext> context =
static_cast<Renderer*>(g_renderer.get())->GetMainGLContext()->CreateSharedContext();
if (!context) if (!context)
{ {
PanicAlert("Failed to create shared context for shader compiling."); PanicAlert("Failed to create shared context for shader compiling.");
@ -824,7 +825,7 @@ bool SharedContextAsyncShaderCompiler::WorkerThreadInitWorkerThread(void* param)
s_is_shared_context = true; s_is_shared_context = true;
if (g_ActiveConfig.backend_info.bSupportsPrimitiveRestart) if (g_ActiveConfig.backend_info.bSupportsPrimitiveRestart)
GLUtil::EnablePrimitiveRestart(); GLUtil::EnablePrimitiveRestart(context);
return true; return true;
} }

47
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -353,9 +353,10 @@ static void InitDriverInfo()
} }
// Init functions // Init functions
Renderer::Renderer() Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context)
: ::Renderer(static_cast<int>(std::max(g_main_gl_context->GetBackBufferWidth(), 1u)), : ::Renderer(static_cast<int>(std::max(main_gl_context->GetBackBufferWidth(), 1u)),
static_cast<int>(std::max(g_main_gl_context->GetBackBufferHeight(), 1u))) static_cast<int>(std::max(main_gl_context->GetBackBufferHeight(), 1u))),
m_main_gl_context(std::move(main_gl_context))
{ {
bool bSuccess = true; bool bSuccess = true;
@ -365,7 +366,7 @@ Renderer::Renderer()
InitDriverInfo(); InitDriverInfo();
if (!g_main_gl_context->IsGLES()) if (!m_main_gl_context->IsGLES())
{ {
if (!GLExtensions::Supports("GL_ARB_framebuffer_object")) if (!GLExtensions::Supports("GL_ARB_framebuffer_object"))
{ {
@ -500,7 +501,7 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsBPTCTextures = g_Config.backend_info.bSupportsBPTCTextures =
GLExtensions::Supports("GL_ARB_texture_compression_bptc"); GLExtensions::Supports("GL_ARB_texture_compression_bptc");
if (g_main_gl_context->IsGLES()) if (m_main_gl_context->IsGLES())
{ {
g_ogl_config.SupportedESPointSize = g_ogl_config.SupportedESPointSize =
GLExtensions::Supports("GL_OES_geometry_point_size") ? GLExtensions::Supports("GL_OES_geometry_point_size") ?
@ -731,7 +732,7 @@ Renderer::Renderer()
if (!g_ogl_config.bSupportsGLBufferStorage && !g_ogl_config.bSupportsGLPinnedMemory) if (!g_ogl_config.bSupportsGLBufferStorage && !g_ogl_config.bSupportsGLPinnedMemory)
{ {
OSD::AddMessage(StringFromFormat("Your OpenGL driver does not support %s_buffer_storage.", OSD::AddMessage(StringFromFormat("Your OpenGL driver does not support %s_buffer_storage.",
g_main_gl_context->IsGLES() ? "EXT" : "ARB"), m_main_gl_context->IsGLES() ? "EXT" : "ARB"),
60000); 60000);
OSD::AddMessage("This device's performance will be terrible.", 60000); OSD::AddMessage("This device's performance will be terrible.", 60000);
OSD::AddMessage("Please ask your device vendor for an updated OpenGL driver.", 60000); OSD::AddMessage("Please ask your device vendor for an updated OpenGL driver.", 60000);
@ -760,7 +761,7 @@ Renderer::Renderer()
// Handle VSync on/off // Handle VSync on/off
s_vsync = g_ActiveConfig.IsVSync(); s_vsync = g_ActiveConfig.IsVSync();
if (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC)) if (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC))
g_main_gl_context->SwapInterval(s_vsync); m_main_gl_context->SwapInterval(s_vsync);
// Because of the fixed framebuffer size we need to disable the resolution // Because of the fixed framebuffer size we need to disable the resolution
// options while running // options while running
@ -795,18 +796,22 @@ Renderer::Renderer()
glClearDepthf(1.0f); glClearDepthf(1.0f);
if (g_ActiveConfig.backend_info.bSupportsPrimitiveRestart) if (g_ActiveConfig.backend_info.bSupportsPrimitiveRestart)
GLUtil::EnablePrimitiveRestart(); GLUtil::EnablePrimitiveRestart(m_main_gl_context.get());
IndexGenerator::Init(); IndexGenerator::Init();
UpdateActiveConfig(); UpdateActiveConfig();
ClearEFBCache(); ClearEFBCache();
} }
Renderer::~Renderer() = default; Renderer::~Renderer()
{
m_main_gl_context->ClearCurrent();
m_main_gl_context->Shutdown();
}
bool Renderer::IsHeadless() const bool Renderer::IsHeadless() const
{ {
return g_main_gl_context->IsHeadless(); return m_main_gl_context->IsHeadless();
} }
void Renderer::Shutdown() void Renderer::Shutdown()
@ -1048,7 +1053,7 @@ u32 Renderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 poke_data)
std::unique_ptr<u32[]> colorMap(new u32[targetPixelRcWidth * targetPixelRcHeight]); std::unique_ptr<u32[]> colorMap(new u32[targetPixelRcWidth * targetPixelRcHeight]);
if (g_main_gl_context->IsGLES()) if (IsGLES())
// XXX: Swap colours // XXX: Swap colours
glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth, glReadPixels(targetPixelRc.left, targetPixelRc.bottom, targetPixelRcWidth,
targetPixelRcHeight, GL_RGBA, GL_UNSIGNED_BYTE, colorMap.get()); targetPixelRcHeight, GL_RGBA, GL_UNSIGNED_BYTE, colorMap.get());
@ -1355,7 +1360,7 @@ void Renderer::ApplyBlendingState(const BlendingState state, bool force)
GL_XOR, GL_OR, GL_NOR, GL_EQUIV, GL_INVERT, GL_OR_REVERSE, GL_XOR, GL_OR, GL_NOR, GL_EQUIV, GL_INVERT, GL_OR_REVERSE,
GL_COPY_INVERTED, GL_OR_INVERTED, GL_NAND, GL_SET}; GL_COPY_INVERTED, GL_OR_INVERTED, GL_NAND, GL_SET};
if (g_main_gl_context->IsGLES()) if (IsGLES())
{ {
// Logic ops aren't available in GLES3 // Logic ops aren't available in GLES3
} }
@ -1425,7 +1430,7 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
OSD::DrawMessages(); OSD::DrawMessages();
// Swap the back and front buffers, presenting the image. // Swap the back and front buffers, presenting the image.
g_main_gl_context->Swap(); m_main_gl_context->Swap();
} }
else else
{ {
@ -1470,7 +1475,7 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
{ {
s_vsync = g_ActiveConfig.IsVSync(); s_vsync = g_ActiveConfig.IsVSync();
if (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC)) if (!DriverDetails::HasBug(DriverDetails::BUG_BROKEN_VSYNC))
g_main_gl_context->SwapInterval(s_vsync); m_main_gl_context->SwapInterval(s_vsync);
} }
// Clean out old stuff from caches. It's not worth it to clean out the shader caches. // Clean out old stuff from caches. It's not worth it to clean out the shader caches.
@ -1504,12 +1509,12 @@ void Renderer::CheckForSurfaceChange()
if (!m_surface_changed.TestAndClear()) if (!m_surface_changed.TestAndClear())
return; return;
g_main_gl_context->UpdateSurface(m_new_surface_handle); m_main_gl_context->UpdateSurface(m_new_surface_handle);
m_new_surface_handle = nullptr; m_new_surface_handle = nullptr;
// With a surface change, the window likely has new dimensions. // With a surface change, the window likely has new dimensions.
m_backbuffer_width = g_main_gl_context->GetBackBufferWidth(); m_backbuffer_width = m_main_gl_context->GetBackBufferWidth();
m_backbuffer_height = g_main_gl_context->GetBackBufferHeight(); m_backbuffer_height = m_main_gl_context->GetBackBufferHeight();
} }
void Renderer::CheckForSurfaceResize() void Renderer::CheckForSurfaceResize()
@ -1517,9 +1522,9 @@ void Renderer::CheckForSurfaceResize()
if (!m_surface_resized.TestAndClear()) if (!m_surface_resized.TestAndClear())
return; return;
g_main_gl_context->Update(); m_main_gl_context->Update();
m_backbuffer_width = g_main_gl_context->GetBackBufferWidth(); m_backbuffer_width = m_main_gl_context->GetBackBufferWidth();
m_backbuffer_height = g_main_gl_context->GetBackBufferHeight(); m_backbuffer_height = m_main_gl_context->GetBackBufferHeight();
} }
void Renderer::DrawEFB(GLuint framebuffer, const TargetRectangle& target_rc, void Renderer::DrawEFB(GLuint framebuffer, const TargetRectangle& target_rc,
@ -1540,7 +1545,7 @@ void Renderer::ResetAPIState()
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glDisable(GL_BLEND); glDisable(GL_BLEND);
if (!g_main_gl_context->IsGLES()) if (!IsGLES())
glDisable(GL_COLOR_LOGIC_OP); glDisable(GL_COLOR_LOGIC_OP);
if (g_ActiveConfig.backend_info.bSupportsDepthClamp) if (g_ActiveConfig.backend_info.bSupportsDepthClamp)
{ {

12
Source/Core/VideoBackends/OGL/Render.h
View File

@ -7,7 +7,8 @@
#include <array> #include <array>
#include <string> #include <string>
#include "Common/GL/GLUtil.h" #include "Common/GL/GLContext.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "VideoCommon/RenderBase.h" #include "VideoCommon/RenderBase.h"
struct XFBSourceBase; struct XFBSourceBase;
@ -81,7 +82,7 @@ extern VideoConfig g_ogl_config;
class Renderer : public ::Renderer class Renderer : public ::Renderer
{ {
public: public:
Renderer(); Renderer(std::unique_ptr<GLContext> main_gl_context);
~Renderer() override; ~Renderer() override;
bool IsHeadless() const override; bool IsHeadless() const override;
@ -143,6 +144,10 @@ public:
std::unique_ptr<VideoCommon::AsyncShaderCompiler> CreateAsyncShaderCompiler() override; std::unique_ptr<VideoCommon::AsyncShaderCompiler> CreateAsyncShaderCompiler() override;
// Only call methods from this on the GPU thread.
GLContext* GetMainGLContext() const { return m_main_gl_context.get(); }
bool IsGLES() const { return m_main_gl_context->IsGLES(); }
private: private:
void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc, void UpdateEFBCache(EFBAccessType type, u32 cacheRectIdx, const EFBRectangle& efbPixelRc,
const TargetRectangle& targetPixelRc, const void* data); const TargetRectangle& targetPixelRc, const void* data);
@ -161,10 +166,11 @@ private:
void ApplyDepthState(const DepthState state, bool force = false); void ApplyDepthState(const DepthState state, bool force = false);
void UploadUtilityUniforms(const void* uniforms, u32 uniforms_size); void UploadUtilityUniforms(const void* uniforms, u32 uniforms_size);
std::unique_ptr<GLContext> m_main_gl_context;
std::array<const AbstractTexture*, 8> m_bound_textures{}; std::array<const AbstractTexture*, 8> m_bound_textures{};
const OGLPipeline* m_graphics_pipeline = nullptr; const OGLPipeline* m_graphics_pipeline = nullptr;
RasterizationState m_current_rasterization_state = {}; RasterizationState m_current_rasterization_state = {};
DepthState m_current_depth_state = {}; DepthState m_current_depth_state = {};
BlendingState m_current_blend_state = {}; BlendingState m_current_blend_state = {};
}; };
} } // namespace OGL

4
Source/Core/VideoBackends/OGL/SamplerCache.cpp
View File

@ -3,11 +3,11 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "VideoBackends/OGL/SamplerCache.h" #include "VideoBackends/OGL/SamplerCache.h"
#include "VideoBackends/OGL/Render.h"
#include <memory> #include <memory>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/GL/GLContext.h"
#include "VideoCommon/SamplerCommon.h" #include "VideoCommon/SamplerCommon.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
@ -99,7 +99,7 @@ void SamplerCache::SetParameters(GLuint sampler_id, const SamplerState& params)
glSamplerParameterf(sampler_id, GL_TEXTURE_MIN_LOD, params.min_lod / 16.f); glSamplerParameterf(sampler_id, GL_TEXTURE_MIN_LOD, params.min_lod / 16.f);
glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, params.max_lod / 16.f); glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, params.max_lod / 16.f);
if (!g_main_gl_context->IsGLES()) if (!static_cast<Renderer*>(g_renderer.get())->IsGLES())
glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, params.lod_bias / 256.f); glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, params.lod_bias / 256.f);
if (params.anisotropic_filtering && g_ogl_config.bSupportsAniso) if (params.anisotropic_filtering && g_ogl_config.bSupportsAniso)

4
Source/Core/VideoBackends/OGL/VideoBackend.h
View File

@ -7,6 +7,8 @@
#include <string> #include <string>
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
class GLContext;
namespace OGL namespace OGL
{ {
class VideoBackend : public VideoBackendBase class VideoBackend : public VideoBackendBase
@ -20,7 +22,7 @@ class VideoBackend : public VideoBackendBase
void InitBackendInfo() override; void InitBackendInfo() override;
private: private:
bool InitializeGLExtensions(); bool InitializeGLExtensions(GLContext* context);
bool FillBackendInfo(); bool FillBackendInfo();
}; };
} // namespace OGL } // namespace OGL

20
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -66,7 +66,7 @@ std::string VideoBackend::GetName() const
std::string VideoBackend::GetDisplayName() const std::string VideoBackend::GetDisplayName() const
{ {
if (g_main_gl_context && g_main_gl_context->GetMode() == GLContext::Mode::OpenGLES) if (g_renderer && static_cast<Renderer*>(g_renderer.get())->IsGLES())
return _trans("OpenGL ES"); return _trans("OpenGL ES");
else else
return _trans("OpenGL"); return _trans("OpenGL");
@ -108,10 +108,10 @@ void VideoBackend::InitBackendInfo()
g_Config.backend_info.AAModes = {1, 2, 4, 8}; g_Config.backend_info.AAModes = {1, 2, 4, 8};
} }
bool VideoBackend::InitializeGLExtensions() bool VideoBackend::InitializeGLExtensions(GLContext* context)
{ {
// Init extension support. // Init extension support.
if (!GLExtensions::Init()) if (!GLExtensions::Init(context))
{ {
// OpenGL 2.0 is required for all shader based drawings. There is no way to get this by // OpenGL 2.0 is required for all shader based drawings. There is no way to get this by
// extensions // extensions
@ -161,15 +161,16 @@ bool VideoBackend::Initialize(const WindowSystemInfo& wsi)
{ {
InitializeShared(); InitializeShared();
g_main_gl_context = GLContext::Create(wsi, g_ActiveConfig.stereo_mode == StereoMode::QuadBuffer); std::unique_ptr<GLContext> main_gl_context =
if (!g_main_gl_context) GLContext::Create(wsi, g_ActiveConfig.stereo_mode == StereoMode::QuadBuffer);
if (!main_gl_context)
return false; return false;
g_main_gl_context->MakeCurrent(); main_gl_context->MakeCurrent();
if (!InitializeGLExtensions() || !FillBackendInfo()) if (!InitializeGLExtensions(main_gl_context.get()) || !FillBackendInfo())
return false; return false;
g_renderer = std::make_unique<Renderer>(); g_renderer = std::make_unique<Renderer>(std::move(main_gl_context));
g_vertex_manager = std::make_unique<VertexManager>(); g_vertex_manager = std::make_unique<VertexManager>();
g_perf_query = GetPerfQuery(); g_perf_query = GetPerfQuery();
ProgramShaderCache::Init(); ProgramShaderCache::Init();
@ -195,9 +196,6 @@ void VideoBackend::Shutdown()
g_perf_query.reset(); g_perf_query.reset();
g_vertex_manager.reset(); g_vertex_manager.reset();
g_renderer.reset(); g_renderer.reset();
g_main_gl_context->ClearCurrent();
g_main_gl_context->Shutdown();
g_main_gl_context.reset();
ShutdownShared(); ShutdownShared();
} }
} // namespace OGL } // namespace OGL

61
Source/Core/VideoBackends/Software/SWOGLWindow.cpp
View File

@ -7,48 +7,58 @@
#include "Common/GL/GLContext.h" #include "Common/GL/GLContext.h"
#include "Common/GL/GLUtil.h" #include "Common/GL/GLUtil.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
#include "VideoBackends/Software/SWOGLWindow.h" #include "VideoBackends/Software/SWOGLWindow.h"
#include "VideoBackends/Software/SWTexture.h" #include "VideoBackends/Software/SWTexture.h"
std::unique_ptr<SWOGLWindow> SWOGLWindow::s_instance; SWOGLWindow::SWOGLWindow() = default;
void SWOGLWindow::Init(const WindowSystemInfo& wsi) SWOGLWindow::~SWOGLWindow()
{ {
g_main_gl_context = GLContext::Create(wsi); if (m_gl_context)
if (!g_main_gl_context)
{ {
ERROR_LOG(VIDEO, "GLInterface::Create failed."); m_gl_context->ClearCurrent();
m_gl_context->Shutdown();
}
}
std::unique_ptr<SWOGLWindow> SWOGLWindow::Create(const WindowSystemInfo& wsi)
{
std::unique_ptr<SWOGLWindow> window = std::unique_ptr<SWOGLWindow>(new SWOGLWindow());
if (!window->Initialize(wsi))
{
PanicAlert("Failed to create OpenGL window");
return nullptr;
} }
s_instance.reset(new SWOGLWindow()); return window;
} }
void SWOGLWindow::Shutdown() bool SWOGLWindow::IsHeadless() const
{ {
g_main_gl_context->Shutdown(); return m_gl_context->IsHeadless();
g_main_gl_context.reset();
s_instance.reset();
} }
void SWOGLWindow::Prepare() bool SWOGLWindow::Initialize(const WindowSystemInfo& wsi)
{ {
if (m_init) m_gl_context = GLContext::Create(wsi);
return; if (!m_gl_context)
m_init = true; return false;
m_gl_context->MakeCurrent();
// Init extension support. // Init extension support.
if (!GLExtensions::Init()) if (!GLExtensions::Init(m_gl_context.get()))
{ {
ERROR_LOG(VIDEO, "GLExtensions::Init failed!Does your video card support OpenGL 2.0?"); ERROR_LOG(VIDEO, "GLExtensions::Init failed!Does your video card support OpenGL 2.0?");
return; return false;
} }
else if (GLExtensions::Version() < 310) else if (GLExtensions::Version() < 310)
{ {
ERROR_LOG(VIDEO, "OpenGL Version %d detected, but at least 3.1 is required.", ERROR_LOG(VIDEO, "OpenGL Version %d detected, but at least 3.1 is required.",
GLExtensions::Version()); GLExtensions::Version());
return; return false;
} }
std::string frag_shader = "in vec2 TexCoord;\n" std::string frag_shader = "in vec2 TexCoord;\n"
@ -65,9 +75,9 @@ void SWOGLWindow::Prepare()
" TexCoord = vec2(rawpos.x, -rawpos.y);\n" " TexCoord = vec2(rawpos.x, -rawpos.y);\n"
"}\n"; "}\n";
std::string header = g_main_gl_context->IsGLES() ? "#version 300 es\n" std::string header = m_gl_context->IsGLES() ? "#version 300 es\n"
"precision highp float;\n" : "precision highp float;\n" :
"#version 140\n"; "#version 140\n";
m_image_program = GLUtil::CompileProgram(header + vertex_shader, header + frag_shader); m_image_program = GLUtil::CompileProgram(header + vertex_shader, header + frag_shader);
@ -81,6 +91,7 @@ void SWOGLWindow::Prepare()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glGenVertexArrays(1, &m_image_vao); glGenVertexArrays(1, &m_image_vao);
return true;
} }
void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color) void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color)
@ -91,10 +102,10 @@ void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color)
void SWOGLWindow::ShowImage(AbstractTexture* image, const EFBRectangle& xfb_region) void SWOGLWindow::ShowImage(AbstractTexture* image, const EFBRectangle& xfb_region)
{ {
SW::SWTexture* sw_image = static_cast<SW::SWTexture*>(image); SW::SWTexture* sw_image = static_cast<SW::SWTexture*>(image);
g_main_gl_context->Update(); // just updates the render window position and the backbuffer size m_gl_context->Update(); // just updates the render window position and the backbuffer size
GLsizei glWidth = (GLsizei)g_main_gl_context->GetBackBufferWidth(); GLsizei glWidth = (GLsizei)m_gl_context->GetBackBufferWidth();
GLsizei glHeight = (GLsizei)g_main_gl_context->GetBackBufferHeight(); GLsizei glHeight = (GLsizei)m_gl_context->GetBackBufferHeight();
glViewport(0, 0, glWidth, glHeight); glViewport(0, 0, glWidth, glHeight);
@ -121,5 +132,5 @@ void SWOGLWindow::ShowImage(AbstractTexture* image, const EFBRectangle& xfb_regi
// } // }
m_text.clear(); m_text.clear();
g_main_gl_context->Swap(); m_gl_context->Swap();
} }

22
Source/Core/VideoBackends/Software/SWOGLWindow.h
View File

@ -11,15 +11,18 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoCommon.h"
class GLContext;
class AbstractTexture; class AbstractTexture;
struct WindowSystemInfo; struct WindowSystemInfo;
class SWOGLWindow class SWOGLWindow
{ {
public: public:
static void Init(const WindowSystemInfo& wsi); ~SWOGLWindow();
static void Shutdown();
void Prepare(); GLContext* GetContext() const { return m_gl_context.get(); }
bool IsHeadless() const;
// Will be printed on the *next* image // Will be printed on the *next* image
void PrintText(const std::string& text, int x, int y, u32 color); void PrintText(const std::string& text, int x, int y, u32 color);
@ -27,10 +30,13 @@ public:
// Image to show, will be swapped immediately // Image to show, will be swapped immediately
void ShowImage(AbstractTexture* image, const EFBRectangle& xfb_region); void ShowImage(AbstractTexture* image, const EFBRectangle& xfb_region);
static std::unique_ptr<SWOGLWindow> s_instance; static std::unique_ptr<SWOGLWindow> Create(const WindowSystemInfo& wsi);
private: private:
SWOGLWindow() {} SWOGLWindow();
bool Initialize(const WindowSystemInfo& wsi);
struct TextData struct TextData
{ {
std::string text; std::string text;
@ -39,7 +45,9 @@ private:
}; };
std::vector<TextData> m_text; std::vector<TextData> m_text;
bool m_init{false}; u32 m_image_program = 0;
u32 m_image_texture = 0;
u32 m_image_vao = 0;
u32 m_image_program, m_image_texture, m_image_vao; std::unique_ptr<GLContext> m_gl_context;
}; };

11
Source/Core/VideoBackends/Software/SWRenderer.cpp
View File

@ -24,14 +24,15 @@
#include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoConfig.h"
SWRenderer::SWRenderer() SWRenderer::SWRenderer(std::unique_ptr<SWOGLWindow> window)
: ::Renderer(static_cast<int>(MAX_XFB_WIDTH), static_cast<int>(MAX_XFB_HEIGHT)) : ::Renderer(static_cast<int>(MAX_XFB_WIDTH), static_cast<int>(MAX_XFB_HEIGHT)),
m_window(std::move(window))
{ {
} }
bool SWRenderer::IsHeadless() const bool SWRenderer::IsHeadless() const
{ {
return g_main_gl_context->IsHeadless(); return m_window->IsHeadless();
} }
std::unique_ptr<AbstractTexture> SWRenderer::CreateTexture(const TextureConfig& config) std::unique_ptr<AbstractTexture> SWRenderer::CreateTexture(const TextureConfig& config)
@ -55,7 +56,7 @@ SWRenderer::CreateFramebuffer(const AbstractTexture* color_attachment,
void SWRenderer::RenderText(const std::string& pstr, int left, int top, u32 color) void SWRenderer::RenderText(const std::string& pstr, int left, int top, u32 color)
{ {
SWOGLWindow::s_instance->PrintText(pstr, left, top, color); m_window->PrintText(pstr, left, top, color);
} }
class SWShader final : public AbstractShader class SWShader final : public AbstractShader
@ -100,7 +101,7 @@ void SWRenderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_regi
if (!IsHeadless()) if (!IsHeadless())
{ {
DrawDebugText(); DrawDebugText();
SWOGLWindow::s_instance->ShowImage(texture, xfb_region); m_window->ShowImage(texture, xfb_region);
} }
UpdateActiveConfig(); UpdateActiveConfig();

9
Source/Core/VideoBackends/Software/SWRenderer.h
View File

@ -4,14 +4,18 @@
#pragma once #pragma once
#include <memory>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "VideoCommon/RenderBase.h" #include "VideoCommon/RenderBase.h"
class SWOGLWindow;
class SWRenderer : public Renderer class SWRenderer : public Renderer
{ {
public: public:
SWRenderer(); SWRenderer(std::unique_ptr<SWOGLWindow> window);
bool IsHeadless() const override; bool IsHeadless() const override;
@ -42,4 +46,7 @@ public:
u32 color, u32 z) override; u32 color, u32 z) override;
void ReinterpretPixelData(unsigned int convtype) override {} void ReinterpretPixelData(unsigned int convtype) override {}
private:
std::unique_ptr<SWOGLWindow> m_window;
}; };

10
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -82,16 +82,15 @@ bool VideoSoftware::Initialize(const WindowSystemInfo& wsi)
{ {
InitializeShared(); InitializeShared();
SWOGLWindow::Init(wsi); std::unique_ptr<SWOGLWindow> window = SWOGLWindow::Create(wsi);
if (!window)
return false;
Clipper::Init(); Clipper::Init();
Rasterizer::Init(); Rasterizer::Init();
DebugUtil::Init(); DebugUtil::Init();
g_main_gl_context->MakeCurrent(); g_renderer = std::make_unique<SWRenderer>(std::move(window));
SWOGLWindow::s_instance->Prepare();
g_renderer = std::make_unique<SWRenderer>();
g_vertex_manager = std::make_unique<SWVertexLoader>(); g_vertex_manager = std::make_unique<SWVertexLoader>();
g_perf_query = std::make_unique<PerfQuery>(); g_perf_query = std::make_unique<PerfQuery>();
g_texture_cache = std::make_unique<TextureCache>(); g_texture_cache = std::make_unique<TextureCache>();
@ -108,7 +107,6 @@ void VideoSoftware::Shutdown()
g_renderer->Shutdown(); g_renderer->Shutdown();
DebugUtil::Shutdown(); DebugUtil::Shutdown();
SWOGLWindow::Shutdown();
g_framebuffer_manager.reset(); g_framebuffer_manager.reset();
g_texture_cache.reset(); g_texture_cache.reset();
g_perf_query.reset(); g_perf_query.reset();