From 895cefec60be1637f8a99c3cdb1b24fc52b40095 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 8 Feb 2020 21:18:41 +0900
Subject: [PATCH] Qt: Fix core trying to use core OpenGL shaders on OpenGL ES

---
 src/duckstation-qt/opengldisplaywindow.cpp | 15 +++++++--------
 src/duckstation-qt/opengldisplaywindow.h   |  2 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/duckstation-qt/opengldisplaywindow.cpp b/src/duckstation-qt/opengldisplaywindow.cpp
index 18448ba3a..bd376a0e5 100644
--- a/src/duckstation-qt/opengldisplaywindow.cpp
+++ b/src/duckstation-qt/opengldisplaywindow.cpp
@@ -111,7 +111,7 @@ HostDisplay* OpenGLDisplayWindow::getHostDisplayInterface()
 
 HostDisplay::RenderAPI OpenGLDisplayWindow::GetRenderAPI() const
 {
-  return HostDisplay::RenderAPI::OpenGL;
+  return m_gl_context->isOpenGLES() ? HostDisplay::RenderAPI::OpenGLES : HostDisplay::RenderAPI::OpenGL;
 }
 
 void* OpenGLDisplayWindow::GetRenderDevice() const
@@ -174,14 +174,14 @@ void OpenGLDisplayWindow::WindowResized() {}
 
 const char* OpenGLDisplayWindow::GetGLSLVersionString() const
 {
-  return m_is_gles ? "#version 300 es" : "#version 130\n";
+  return m_gl_context->isOpenGLES() ? "#version 300 es" : "#version 130\n";
 }
 
 std::string OpenGLDisplayWindow::GetGLSLVersionHeader() const
 {
   std::string header = GetGLSLVersionString();
   header += "\n\n";
-  if (m_is_gles)
+  if (m_gl_context->isOpenGLES())
   {
     header += "precision highp float;\n";
     header += "precision highp int;\n\n";
@@ -260,9 +260,8 @@ bool OpenGLDisplayWindow::createDeviceContext(QThread* worker_thread, bool debug
   }
 
   surface_format = m_gl_context->format();
-  m_is_gles = m_gl_context->isOpenGLES();
-  Log_InfoPrintf("Got a %s %d.%d context", (m_is_gles ? "OpenGL ES" : "desktop OpenGL"), surface_format.majorVersion(),
-                 surface_format.minorVersion());
+  Log_InfoPrintf("Got a %s %d.%d context", (m_gl_context->isOpenGLES() ? "OpenGL ES" : "desktop OpenGL"),
+                 surface_format.majorVersion(), surface_format.minorVersion());
 
   if (!m_gl_context->makeCurrent(this))
   {
@@ -292,7 +291,7 @@ bool OpenGLDisplayWindow::initializeDeviceContext(bool debug_device)
 
   // Load GLAD.
   const auto load_result =
-    m_is_gles ? gladLoadGLES2Loader(GetProcAddressCallback) : gladLoadGLLoader(GetProcAddressCallback);
+    m_gl_context->isOpenGLES() ? gladLoadGLES2Loader(GetProcAddressCallback) : gladLoadGLLoader(GetProcAddressCallback);
   if (!load_result)
   {
     Log_ErrorPrintf("Failed to load GL functions");
@@ -382,7 +381,7 @@ void main()
     return false;
   }
 
-  if (!m_is_gles)
+  if (!m_gl_context->isOpenGLES())
     m_display_program.BindFragData(0, "o_col0");
 
   if (!m_display_program.Link())
diff --git a/src/duckstation-qt/opengldisplaywindow.h b/src/duckstation-qt/opengldisplaywindow.h
index 3bd8f8ec8..5feeafb12 100644
--- a/src/duckstation-qt/opengldisplaywindow.h
+++ b/src/duckstation-qt/opengldisplaywindow.h
@@ -60,6 +60,4 @@ private:
   GLuint m_display_vao = 0;
   GLuint m_display_nearest_sampler = 0;
   GLuint m_display_linear_sampler = 0;
-
-  bool m_is_gles = false;
 };