MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Replace define GLES3 by GLES3_1 since current code is GLES3.1 compatible.

Browse Source 
GLES3 is different.
This commit is contained in:
Sergey Lipskiy 2015-05-04 16:44:40 +06:00
parent a550f70330
commit 09b78ea577
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DepthBuffer.cpp
View File

@ -127,7 +127,7 @@ void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture
glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, false);
else
glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, video().getWidth(), video().getHeight(), false);
#elif defined(GLES3)
#elif defined(GLES3_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

2
src/DepthBuffer.h
View File

@ -74,7 +74,7 @@ void DepthBuffer_Destroy();
#ifdef GLES2
#define DEPTH_COMPONENT_FORMAT GL_DEPTH_COMPONENT24_OES
#elif defined (GLES3)
#elif defined (GLES3_1)
#define DEPTH_COMPONENT_FORMAT GL_DEPTH_COMPONENT32F
#else
#define DEPTH_COMPONENT_FORMAT GL_DEPTH_COMPONENT

2
src/FrameBuffer.cpp
View File

@ -198,7 +198,7 @@ void FrameBuffer::init(u32 _address, u32 _endAddress, u16 _format, u16 _size, u1
else
glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, monohromeInternalformat, m_pTexture->realWidth, m_pTexture->realHeight, false);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, m_pTexture->glName, 0);
#elif defined(GLES3)
#elif defined(GLES3_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

2
src/OpenGL.cpp
View File

@ -1186,7 +1186,7 @@ void OGLRender::_initExtensions()
glGetIntegerv(GL_MINOR_VERSION, &minorVersion);
#ifndef GLESX
m_bImageTexture = (majorVersion >= 4) && (minorVersion >= 3) && (glBindImageTexture != NULL);
#elif defined(GLES3)
#elif defined(GLES3_1)
m_bImageTexture = (majorVersion >= 3) && (minorVersion >= 1) && (glBindImageTexture != NULL);
#else
m_bImageTexture = false;

2
src/OpenGL.h
View File

@ -16,7 +16,7 @@
#define GL_DRAW_FRAMEBUFFER GL_FRAMEBUFFER
#define GL_READ_FRAMEBUFFER GL_FRAMEBUFFER
#define GLESX
#elif defined(GLES3)
#elif defined(GLES3_1)
#include <GLES3/gl31.h>
#include <GLES3/gl3ext.h>
#define GLESX