From ad77e3db52ee072441fe063b0948fb0056f7cb67 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <loganmc10@users.noreply.github.com>
Date: Mon, 21 Nov 2016 09:52:08 -0700
Subject: [PATCH] Remove some GLES3_1 ifdefs

---
 src/DepthBuffer.cpp                | 2 +-
 src/FrameBuffer.cpp                | 2 +-
 src/OpenGL.cpp                     | 4 +---
 src/Textures.cpp                   | 2 +-
 src/mupenplus/OpenGL_mupenplus.cpp | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/DepthBuffer.cpp b/src/DepthBuffer.cpp
index 0bd727a3..3e0e14c2 100644
--- a/src/DepthBuffer.cpp
+++ b/src/DepthBuffer.cpp
@@ -145,7 +145,7 @@ void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture
 #ifdef GL_MULTISAMPLING_SUPPORT
 	if (_multisample) {
 		glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _pTexture->glName);
-#if defined(GLES3_1)
+#if defined(GLESX)
 		glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, fboFormats.depthInternalFormat, _pTexture->realWidth, _pTexture->realHeight, false);
 #else
 		glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, fboFormats.depthInternalFormat, _pTexture->realWidth, _pTexture->realHeight, false);
diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
index 01140e76..d7b5117f 100644
--- a/src/FrameBuffer.cpp
+++ b/src/FrameBuffer.cpp
@@ -141,7 +141,7 @@ void FrameBuffer::init(u32 _address, u32 _endAddress, u16 _format, u16 _size, u1
 #ifdef GL_MULTISAMPLING_SUPPORT
 	if (config.video.multisampling != 0) {
 		glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_pTexture->glName);
-#if defined(GLES3_1)
+#if defined(GLESX)
 		if (_size > G_IM_SIZ_8b)
 			glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_RGBA8, m_pTexture->realWidth, m_pTexture->realHeight, false);
 		else
diff --git a/src/OpenGL.cpp b/src/OpenGL.cpp
index 36fa17dc..6a7517e6 100644
--- a/src/OpenGL.cpp
+++ b/src/OpenGL.cpp
@@ -2095,10 +2095,8 @@ void OGLRender::_initExtensions()
 #ifdef GL_IMAGE_TEXTURES_SUPPORT
 #ifndef GLESX
 	m_bImageTexture = (((majorVersion >= 4) && (minorVersion >= 3)) || OGLVideo::isExtensionSupported("GL_ARB_shader_image_load_store")) && (glBindImageTexture != nullptr);
-#elif defined(GLES3_1)
-	m_bImageTexture = (majorVersion >= 3) && (minorVersion >= 1) && (glBindImageTexture != nullptr);
 #else
-	m_bImageTexture = false;
+	m_bImageTexture = (majorVersion >= 3) && (minorVersion >= 1) && (glBindImageTexture != nullptr);
 #endif
 #else
 	m_bImageTexture = false;
diff --git a/src/Textures.cpp b/src/Textures.cpp
index cc1d9cf0..b8e57b87 100644
--- a/src/Textures.cpp
+++ b/src/Textures.cpp
@@ -489,7 +489,7 @@ void TextureCache::init()
 
 		glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_pMSDummy->glName);
 
-#if defined(GLES3_1)
+#if defined(GLESX)
 		glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling,
 					GL_RGBA8, m_pMSDummy->realWidth, m_pMSDummy->realHeight, false);
 #else
diff --git a/src/mupenplus/OpenGL_mupenplus.cpp b/src/mupenplus/OpenGL_mupenplus.cpp
index cf5f25a9..8be75073 100644
--- a/src/mupenplus/OpenGL_mupenplus.cpp
+++ b/src/mupenplus/OpenGL_mupenplus.cpp
@@ -13,7 +13,7 @@
 #endif
 
 #ifndef EGL
-#if !defined(OS_WINDOWS) || defined(GLES2) || defined(GLES3) || defined(GLES3_1)
+#if !defined(OS_WINDOWS) || defined(GLESX)
 
 void initGLFunctions()
 {