Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-29 19:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix core trying to use core OpenGL shaders on OpenGL ES

Browse source
This commit is contained in:
Connor McLaughlin 2020-02-08 21:18:41 +09:00
parent 1e45c9c4e1
commit 895cefec60
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/duckstation-qt/opengldisplaywindow.cpp
View file

@ -111,7 +111,7 @@ HostDisplay* OpenGLDisplayWindow::getHostDisplayInterface()
HostDisplay::RenderAPI OpenGLDisplayWindow::GetRenderAPI() const HostDisplay::RenderAPI OpenGLDisplayWindow::GetRenderAPI() const
{ {
return HostDisplay::RenderAPI::OpenGL; return m_gl_context->isOpenGLES() ? HostDisplay::RenderAPI::OpenGLES : HostDisplay::RenderAPI::OpenGL;
} }
void* OpenGLDisplayWindow::GetRenderDevice() const void* OpenGLDisplayWindow::GetRenderDevice() const
@ -174,14 +174,14 @@ void OpenGLDisplayWindow::WindowResized() {}
const char* OpenGLDisplayWindow::GetGLSLVersionString() const 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 OpenGLDisplayWindow::GetGLSLVersionHeader() const
{ {
std::string header = GetGLSLVersionString(); std::string header = GetGLSLVersionString();
header += "\n\n"; header += "\n\n";
if (m_is_gles) if (m_gl_context->isOpenGLES())
{ {
header += "precision highp float;\n"; header += "precision highp float;\n";
header += "precision highp int;\n\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(); surface_format = m_gl_context->format();
m_is_gles = m_gl_context->isOpenGLES(); Log_InfoPrintf("Got a %s %d.%d context", (m_gl_context->isOpenGLES() ? "OpenGL ES" : "desktop OpenGL"),
Log_InfoPrintf("Got a %s %d.%d context", (m_is_gles ? "OpenGL ES" : "desktop OpenGL"), surface_format.majorVersion(), surface_format.majorVersion(), surface_format.minorVersion());
surface_format.minorVersion());
if (!m_gl_context->makeCurrent(this)) if (!m_gl_context->makeCurrent(this))
{ {
@ -292,7 +291,7 @@ bool OpenGLDisplayWindow::initializeDeviceContext(bool debug_device)
// Load GLAD. // Load GLAD.
const auto load_result = const auto load_result =
m_is_gles ? gladLoadGLES2Loader(GetProcAddressCallback) : gladLoadGLLoader(GetProcAddressCallback); m_gl_context->isOpenGLES() ? gladLoadGLES2Loader(GetProcAddressCallback) : gladLoadGLLoader(GetProcAddressCallback);
if (!load_result) if (!load_result)
{ {
Log_ErrorPrintf("Failed to load GL functions"); Log_ErrorPrintf("Failed to load GL functions");
@ -382,7 +381,7 @@ void main()
return false; return false;
} }
if (!m_is_gles) if (!m_gl_context->isOpenGLES())
m_display_program.BindFragData(0, "o_col0"); m_display_program.BindFragData(0, "o_col0");
if (!m_display_program.Link()) if (!m_display_program.Link())

2
src/duckstation-qt/opengldisplaywindow.h
View file

@ -60,6 +60,4 @@ private:
GLuint m_display_vao = 0; GLuint m_display_vao = 0;
GLuint m_display_nearest_sampler = 0; GLuint m_display_nearest_sampler = 0;
GLuint m_display_linear_sampler = 0; GLuint m_display_linear_sampler = 0;
bool m_is_gles = false;
}; };