Roll back to ANGLE/2845

1 files changed, 6 insertions, 12 deletions

diff --git a/gfx/angle/src/common/mathutil.cpp b/gfx/angle/src/common/mathutil.cpp
index 5db997c66..acbcbdf0c 100755
--- a/gfx/angle/src/common/mathutil.cpp
+++ b/gfx/angle/src/common/mathutil.cpp
@@ -14,9 +14,6 @@
 namespace gl
 {
 
-namespace
-{
-
 struct RGB9E5Data
 {
     unsigned int R : 9;
@@ -26,20 +23,17 @@ struct RGB9E5Data
 };
 
 // B is the exponent bias (15)
-constexpr int g_sharedexp_bias = 15;
+static const int g_sharedexp_bias = 15;
 
 // N is the number of mantissa bits per component (9)
-constexpr int g_sharedexp_mantissabits = 9;
+static const int g_sharedexp_mantissabits = 9;
 
 // Emax is the maximum allowed biased exponent value (31)
-constexpr int g_sharedexp_maxexponent = 31;
-
-constexpr float g_sharedexp_max =
-    ((static_cast<float>(1 << g_sharedexp_mantissabits) - 1) /
-     static_cast<float>(1 << g_sharedexp_mantissabits)) *
-    static_cast<float>(1 << (g_sharedexp_maxexponent - g_sharedexp_bias));
+static const int g_sharedexp_maxexponent = 31;
 
-}  // anonymous namespace
+static const float g_sharedexp_max = ((pow(2.0f, g_sharedexp_mantissabits) - 1) /
+                                       pow(2.0f, g_sharedexp_mantissabits)) *
+                                     pow(2.0f, g_sharedexp_maxexponent - g_sharedexp_bias);
 
 unsigned int convertRGBFloatsTo999E5(float red, float green, float blue)
 {