Qt: Fix compilation with OpenGL ES 2

mgba-emu · Jan 29, 2018 · f039234055a00181becf186ebceee71bfbbdc597 · f039234
1 parent 82f78ba
commit f039234055a00181becf186ebceee71bfbbdc597
diff --git 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 "CoreController.h"
 
diff --git a/src/platform/qt/DisplayGL.h b/src/platform/qt/DisplayGL.h
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #pragma once
 
-#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
@@ -289,13 +289,13 @@ SettingsView::SettingsView(ConfigController* controller, InputController* inputC
 }
 
 SettingsView::~SettingsView() {
-#if defined(BUILD_GL) || defined(BUILD_GLES)
+#if defined(BUILD_GL) || defined(BUILD_GLES2)
 	setShaderSelector(nullptr);
 #endif
 }
 
 void SettingsView::setShaderSelector(ShaderSelector* shaderSelector) {
-#if defined(BUILD_GL) || defined(BUILD_GLES)
+#if defined(BUILD_GL) || defined(BUILD_GLES2)
 	if (m_shader) {
 		auto items = m_ui.tabs->findItems(tr("Shaders"), Qt::MatchFixedString);
 		for (const auto& item : items) {
diff --git a/src/platform/qt/ShaderSelector.cpp b/src/platform/qt/ShaderSelector.cpp
@@ -21,7 +21,7 @@
 #include <mgba-util/vfs.h>
 #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
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #pragma once
 
-#if defined(BUILD_GL) || defined(BUILD_GLES)
+#if defined(BUILD_GL) || defined(BUILD_GLES2)
 
 #include <QDialog>
 
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
@@ -400,7 +400,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.get());
 	}
@@ -795,7 +795,7 @@ void Window::reloadDisplayDriver() {
 		detachWidget(m_display.get());
 	}
 	m_display = std::move(std::unique_ptr<Display>(Display::create(this)));
-#if defined(BUILD_GL) || defined(BUILD_GLES)
+#if defined(BUILD_GL) || defined(BUILD_GLES2)
 	m_shaderView.reset();
 	m_shaderView = std::make_unique<ShaderSelector>(m_display.get(), m_config);
 #endif
@@ -814,7 +814,7 @@ void Window::reloadDisplayDriver() {
 	const mCoreOptions* opts = m_config->options();
 	m_display->lockAspectRatio(opts->lockAspectRatio);
 	m_display->filter(opts->resampleVideo);
-#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 && m_display->supportsShaders()) {
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
@@ -191,7 +191,7 @@ private slots:
 	QMenu* m_videoLayers;
 	QMenu* m_audioChannels;
 	ShortcutController* m_shortcutController;
-#if defined(BUILD_GL) || defined(BUILD_GLES)
+#if defined(BUILD_GL) || defined(BUILD_GLES2)
 	std::unique_ptr<ShaderSelector> m_shaderView;
 #endif
 	bool m_fullscreenOnStart = false;