Change HAVE_OPENGLES31 defines

libretro · May 7, 2016 · 3fb0dde · 3fb0dde
1 parent 56db32a
commit 3fb0dde
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/mupen64plus-video-gliden64/src/DepthBuffer.cpp b/mupen64plus-video-gliden64/src/DepthBuffer.cpp
@@ -124,7 +124,7 @@ void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture
 #ifdef GL_MULTISAMPLING_SUPPORT
 	if (_multisample) {
 		glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _pTexture->glName);
-#if defined(HAVE_OPENGLES31)
+#if defined(HAVE_OPENGLES_3_1)
 		if (_pBuffer != NULL)
 			glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, false);
 		else

diff --git a/mupen64plus-video-gliden64/src/FrameBuffer_gliden64.cpp b/mupen64plus-video-gliden64/src/FrameBuffer_gliden64.cpp
@@ -244,7 +244,7 @@ void FrameBuffer::init(uint32_t _address, uint32_t _endAddress, uint16_t _format
 #ifdef GL_MULTISAMPLING_SUPPORT
 	if (config.video.multisampling != 0) {
 		glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_pTexture->glName);
-#if defined(HAVE_OPENGLES31)
+#if defined(HAVE_OPENGLES_3_1)
 		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/mupen64plus-video-gliden64/src/OGL3X/Shaders_ogl3x.h b/mupen64plus-video-gliden64/src/OGL3X/Shaders_ogl3x.h
@@ -1,4 +1,4 @@
-#if defined(HAVE_OPENGLES31)
+#if defined(HAVE_OPENGLES_3_1)
 #define MAIN_SHADER_VERSION "#version 310 es \n"
 #define AUXILIARY_SHADER_VERSION "\n"
 #elif defined(HAVE_OPENGLES3)

diff --git a/mupen64plus-video-gliden64/src/OpenGL.cpp b/mupen64plus-video-gliden64/src/OpenGL.cpp
@@ -1246,7 +1246,7 @@ void FBOTextureFormats::init()
 		colorType = GL_UNSIGNED_SHORT_5_6_5;
 		colorFormatBytes = 2;
 	}
-#elif defined(HAVE_OPENGLES3) || defined (HAVE_OPENGLES31)
+#elif defined(HAVE_OPENGLES3) || defined (HAVE_OPENGLES_3_1)
 	colorInternalFormat = GL_RGBA;
 	colorFormat = GL_RGBA;
 	colorType = GL_UNSIGNED_BYTE;
@@ -1324,7 +1324,7 @@ void OGLRender::_initExtensions()
 	printf("OpenGL minor version: %d\n", minorVersion);
 #ifndef GLESX
 	m_bImageTexture = (majorVersion >= 4) && (minorVersion >= 3) && (glBindImageTexture != NULL);
-#elif defined(HAVE_OPENGLES31)
+#elif defined(HAVE_OPENGLES_3_1)
 	m_bImageTexture = (majorVersion >= 3) && (minorVersion >= 1) && (glBindImageTexture != NULL);
 #else
 	m_bImageTexture = false;

diff --git a/mupen64plus-video-gliden64/src/OpenGL.h b/mupen64plus-video-gliden64/src/OpenGL.h
@@ -20,7 +20,7 @@
 #define GLESX
 #define GL_UNIFORMBLOCK_SUPPORT
 
-#elif defined(HAVE_OPENGLES31)
+#elif defined(HAVE_OPENGLES_3_1)
 
 #define GLESX
 #define GL_IMAGE_TEXTURES_SUPPORT

diff --git a/mupen64plus-video-gliden64/src/PostProcessor.cpp b/mupen64plus-video-gliden64/src/PostProcessor.cpp
@@ -10,7 +10,7 @@
 
 #include "Gfx_1.3.h"
 
-#if defined(HAVE_OPENGLES31)
+#if defined(HAVE_OPENGLES_3_1)
 #define SHADER_VERSION "#version 310 es \n"
 #elif defined(HAVE_OPENGLES3)
 #define SHADER_VERSION "#version 300 es \n"

diff --git a/mupen64plus-video-gliden64/src/Textures.cpp b/mupen64plus-video-gliden64/src/Textures.cpp
@@ -487,7 +487,7 @@ void TextureCache::init()
 
 		glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_pMSDummy->glName);
 
-#if defined(HAVE_OPENGLES31)
+#if defined(HAVE_OPENGLES_3_1)
 		glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling,
 					GL_RGBA8, m_pMSDummy->realWidth, m_pMSDummy->realHeight, false);
 #else