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

Remove need for USE_DEPTH_RENDERBUFFER

Browse Source
This commit is contained in:
Logan McNaughton 2017-02-02 11:20:48 -08:00 committed by Sergey Lipskiy
parent cd17543447
commit 4456d43daf
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -92,7 +92,6 @@ if(EXISTS "/opt/vc/include/bcm_host.h")
set(EGL ON) set(EGL ON)
add_definitions( add_definitions(
-DVC -DVC
-DUSE_DEPTH_RENDERBUFFER
) )
include_directories( include_directories(
"/opt/vc/include" "/opt/vc/include"

14
src/Graphics/OpenGLContext/opengl_BufferManipulationObjectFactory.cpp
View File

@ -363,13 +363,13 @@ protected:
monochromeType = GL_UNSIGNED_SHORT_5_6_5; monochromeType = GL_UNSIGNED_SHORT_5_6_5;
monochromeFormatBytes = 2; monochromeFormatBytes = 2;
#ifndef USE_DEPTH_RENDERBUFFER if (Utils::isExtensionSupported("GL_OES_depth_texture")) {
depthInternalFormat = GL_DEPTH_COMPONENT; depthInternalFormat = GL_DEPTH_COMPONENT;
depthFormatBytes = 4; depthFormatBytes = 4;
#else } else {
depthInternalFormat = GL_DEPTH_COMPONENT16; depthInternalFormat = GL_DEPTH_COMPONENT16;
depthFormatBytes = 2; depthFormatBytes = 2;
#endif }
depthFormat = GL_DEPTH_COMPONENT; depthFormat = GL_DEPTH_COMPONENT;
depthType = GL_UNSIGNED_INT; depthType = GL_UNSIGNED_INT;

9
src/Graphics/OpenGLContext/opengl_ContextImpl.cpp
View File

@ -399,11 +399,10 @@ bool ContextImpl::isSupported(graphics::SpecialFeatures _feature) const
return numBinaryFormats != 0 && Utils::isExtensionSupported("GL_ARB_get_program_binary"); return numBinaryFormats != 0 && Utils::isExtensionSupported("GL_ARB_get_program_binary");
} }
case graphics::SpecialFeatures::DepthFramebufferTextures: case graphics::SpecialFeatures::DepthFramebufferTextures:
#ifndef USE_DEPTH_RENDERBUFFER if (!m_glInfo.isGLES2 || Utils::isExtensionSupported("GL_OES_depth_texture"))
return true; return true;
#else else
return false; return false;
#endif
} }
return false; return false;
} }