mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2393 from nihui/patch-3

Browse Source 
Fix build with android ndk r16b
This commit is contained in:
greg-lunarg 2020-12-24 12:53:39 -07:00 committed by GitHub
commit 9325cc013e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -5465,7 +5465,14 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
if (! IsPow2(value)) if (! IsPow2(value))
error(loc, "must be a power of 2", "buffer_reference_align", ""); error(loc, "must be a power of 2", "buffer_reference_align", "");
else else
#ifdef __ANDROID__
// Android NDK r15c tageting ABI 15 doesn't have full support for C++11
// (no std::exp2/log2). ::exp2 is available from C99 but ::log2 isn't
// available up until ABI 18 so we use the mathematical equivalent form
publicType.qualifier.layoutBufferReferenceAlign = (unsigned int)(std::log(value) / std::log(2.0));
#else
publicType.qualifier.layoutBufferReferenceAlign = (unsigned int)std::log2(value); publicType.qualifier.layoutBufferReferenceAlign = (unsigned int)std::log2(value);
#endif
if (nonLiteral) if (nonLiteral)
error(loc, "needs a literal integer", "buffer_reference_align", ""); error(loc, "needs a literal integer", "buffer_reference_align", "");
return; return;