Merge pull request #57 from google/glslang-android

Fixes for compiling glslang on Android.
2015-08-17 10:27:11 -06:00 · 2015-08-17 10:27:11 -06:00 · 156af43c25
commit 156af43c25
parent fb5ba510ca 8b64fa5474
5 changed files with 21 additions and 1 deletions
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@ -48,6 +48,8 @@ namespace {
 bool is_positive_infinity(double x) {
 #ifdef _MSC_VER
  return _fpclass(x) == _FPCLASS_PINF;
+#elif defined __ANDROID__
+  return std::isinf(x) && (x >= 0);
 #else
  return isinf(x) && (x >= 0);
 #endif