From 44b106528c31b6cd224f1200d67b7643aab23109 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Mon, 29 Jan 2018 17:24:39 +0000 Subject: [PATCH] Qt: Fix compilation with OpenGL ES 2 --- src/platform/qt/DisplayGL.cpp | 2 +- src/platform/qt/DisplayGL.h | 2 +- src/platform/qt/SettingsView.cpp | 4 ++-- src/platform/qt/ShaderSelector.cpp | 2 +- src/platform/qt/ShaderSelector.h | 2 +- src/platform/qt/Window.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/platform/qt/DisplayGL.cpp b/src/platform/qt/DisplayGL.cpp index af1cc6d51..c6e14dc0d 100644 --- a/src/platform/qt/DisplayGL.cpp +++ b/src/platform/qt/DisplayGL.cpp @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "DisplayGL.h" -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) #include #include diff --git a/src/platform/qt/DisplayGL.h b/src/platform/qt/DisplayGL.h index f2f6dbc7c..0f596564a 100644 --- a/src/platform/qt/DisplayGL.h +++ b/src/platform/qt/DisplayGL.h @@ -6,7 +6,7 @@ #ifndef QGBA_DISPLAY_GL #define QGBA_DISPLAY_GL -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) #include "Display.h" diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp index d08930149..840c6eb7c 100644 --- a/src/platform/qt/SettingsView.cpp +++ b/src/platform/qt/SettingsView.cpp @@ -187,7 +187,7 @@ SettingsView::SettingsView(ConfigController* controller, InputController* inputC } SettingsView::~SettingsView() { -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) if (m_shader) { m_ui.stackedWidget->removeWidget(m_shader); m_shader->setParent(nullptr); @@ -196,7 +196,7 @@ SettingsView::~SettingsView() { } void SettingsView::setShaderSelector(ShaderSelector* shaderSelector) { -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) m_shader = shaderSelector; m_ui.stackedWidget->addWidget(m_shader); m_ui.tabs->addItem(tr("Shaders")); diff --git a/src/platform/qt/ShaderSelector.cpp b/src/platform/qt/ShaderSelector.cpp index ae32e2145..759cf6c7e 100644 --- a/src/platform/qt/ShaderSelector.cpp +++ b/src/platform/qt/ShaderSelector.cpp @@ -21,7 +21,7 @@ #include #include "platform/video-backend.h" -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) #if !defined(_WIN32) || defined(USE_EPOXY) #include "platform/opengl/gles2.h" diff --git a/src/platform/qt/ShaderSelector.h b/src/platform/qt/ShaderSelector.h index 299204181..9303e15f9 100644 --- a/src/platform/qt/ShaderSelector.h +++ b/src/platform/qt/ShaderSelector.h @@ -6,7 +6,7 @@ #ifndef QGBA_SHADER_SELECTOR_H #define QGBA_SHADER_SELECTOR_H -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) #include diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index fb5807ce5..1e0abeb09 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -78,7 +78,7 @@ Window::Window(ConfigController* config, int playerId, QWidget* parent) updateTitle(); m_display = Display::create(this); -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) m_shaderView = new ShaderSelector(m_display, m_config); #endif @@ -276,7 +276,7 @@ void Window::loadConfig() { enterFullScreen(); } -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) if (opts->shader) { struct VDir* shader = VDirOpen(opts->shader); if (shader) { @@ -463,7 +463,7 @@ void Window::exportSharkport() { void Window::openSettingsWindow() { SettingsView* settingsWindow = new SettingsView(m_config, &m_inputController, m_shortcutController); -#if defined(BUILD_GL) || defined(BUILD_GLES) +#if defined(BUILD_GL) || defined(BUILD_GLES2) if (m_display->supportsShaders()) { settingsWindow->setShaderSelector(m_shaderView); }