Permalink
Browse files

Android: Buildfix for CMake.

May affect other arm64 too.  Also, ifdef out a check in case of compiling
with GL 3 headers (to fix a Linux buildbot issue.)
  • Loading branch information...
unknownbrackets committed Sep 4, 2018
1 parent d23d58c commit f87dcefdd89b72953c6b7172ac3e887d9a7f823b
Showing with 4 additions and 4 deletions.
  1. +2 −4 CMakeLists.txt
  2. +2 −0 ext/native/gfx_es2/gpu_features.cpp
View
@@ -1194,10 +1194,6 @@ if (NOT MOBILE_DEVICE)
Core/WaveFile.h)
endif()
if(ARMV7)
set(CORE_NEON Core/Util/AudioFormatNEON.cpp Core/Util/AudioFormatNEON.h)
endif()
set(GPU_GLES
GPU/GLES/DepalettizeShaderGLES.cpp
GPU/GLES/DepalettizeShaderGLES.h
@@ -1713,6 +1709,8 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/TextureReplacer.h
Core/Util/AudioFormat.cpp
Core/Util/AudioFormat.h
Core/Util/AudioFormatNEON.cpp
Core/Util/AudioFormatNEON.h
Core/Util/GameManager.cpp
Core/Util/GameManager.h
Core/Util/BlockAllocator.cpp
@@ -431,6 +431,7 @@ void CheckGLExtensions() {
glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &gl_extensions.maxVertexTextureUnits);
#ifdef GL_LOW_FLOAT
// This is probably a waste of time, implementations lie.
if (gl_extensions.IsGLES || strstr(extString, "GL_ARB_ES2_compatibility") || gl_extensions.VersionGEThan(4, 1)) {
const GLint precisions[6] = {
@@ -446,6 +447,7 @@ void CheckGLExtensions() {
}
}
}
#endif
gl_extensions.ARB_framebuffer_object = strstr(extString, "GL_ARB_framebuffer_object") != 0;
gl_extensions.EXT_framebuffer_object = strstr(extString, "GL_EXT_framebuffer_object") != 0;

0 comments on commit f87dcef

Please sign in to comment.