commit 2ce222c5919773c80474c40e15fb62d44ce3f963
author Alexis Hetu <sugoi@google.com> Mon May 02 11:20:52 2016 -0400
committer Alexis Hétu <sugoi@google.com> Mon May 02 18:41:47 2016 +0000
tree 11124ac0c3a9ab28c24a63981f44ac77d6303c22
parent f91d9c1c98c30b887cfa1a4d39ddf64d6459e621

Importing log2f fix for JB-MR1

Bug 28474248

Change-Id: Id5b93f3494c918cb344e5da7010dfa48a25cdde1
Reviewed-on: https://swiftshader-review.googlesource.com/5263
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/Intermediate.cpp

diff --git a/src/OpenGL/compiler/Intermediate.cpp b/src/OpenGL/compiler/Intermediate.cpp
index a8c06bf..ca0e59e 100644
--- a/src/OpenGL/compiler/Intermediate.cpp
+++ b/src/OpenGL/compiler/Intermediate.cpp
@@ -14,6 +14,7 @@
 
 #include "localintermediate.h"
 #include "SymbolTable.h"
+#include "Common/Math.hpp"
 
 bool CompareStructure(const TType& leftNodeType, ConstantUnion* rightUnionArray, ConstantUnion* leftUnionArray);
 
@@ -1777,7 +1778,7 @@
 					break;
 				case EOpLog2:
 					switch(getType().getBasicType()) {
-					case EbtFloat: tempConstArray[i].setFConst(log2f(unionArray[i].getFConst())); break;
+					case EbtFloat: tempConstArray[i].setFConst(sw::log2(unionArray[i].getFConst())); break;
 					default:
 						infoSink.info.message(EPrefixInternalError, "Unary operation not folded into constant", getLine());
 						return 0;