summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2018-11-07 21:20:12 +1000
committerStenzek <stenzek@gmail.com>2018-11-07 21:20:12 +1000
commit7efdd1070bf526829d6f852deef9799a0cd2146f (patch)
tree383f098f0b1701f7268e7b160b41d1a649b3ca3b /Source/Core/VideoBackends
parent3d61b1a1d5e1dfc30982f4dfb91b19e167244096 (diff)
OGL: Fix crash when opening graphics window on another backend
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/OGL/Render.cpp1
-rw-r--r--Source/Core/VideoBackends/OGL/Render.h1
-rw-r--r--Source/Core/VideoBackends/OGL/main.cpp2
3 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index 360d4c2dcc..120774b4f7 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -474,6 +474,7 @@ Renderer::Renderer(std::unique_ptr<GLContext> main_gl_context)
g_Config.backend_info.bSupportsDynamicSamplerIndexing =
GLExtensions::Supports("GL_ARB_gpu_shader5");
+ g_ogl_config.bIsES = m_main_gl_context->IsGLES();
g_ogl_config.bSupportsGLSLCache = GLExtensions::Supports("GL_ARB_get_program_binary");
g_ogl_config.bSupportsGLPinnedMemory = GLExtensions::Supports("GL_AMD_pinned_memory");
g_ogl_config.bSupportsGLSync = GLExtensions::Supports("GL_ARB_sync");
diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h
index 5beb4ecd75..f0cc668563 100644
--- a/Source/Core/VideoBackends/OGL/Render.h
+++ b/Source/Core/VideoBackends/OGL/Render.h
@@ -48,6 +48,7 @@ enum class EsFbFetchType
// ogl-only config, so not in VideoConfig.h
struct VideoConfig
{
+ bool bIsES;
bool bSupportsGLSLCache;
bool bSupportsGLPinnedMemory;
bool bSupportsGLSync;
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index bc67b716cc..6e364113cc 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -68,7 +68,7 @@ std::string VideoBackend::GetName() const
std::string VideoBackend::GetDisplayName() const
{
- if (g_renderer && static_cast<Renderer*>(g_renderer.get())->IsGLES())
+ if (g_ogl_config.bIsES)
return _trans("OpenGL ES");
else
return _trans("OpenGL");