From 89ca7ac41557442825b3cc3e27f01f5cbf0ee1a0 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Fri, 5 Apr 2019 10:22:57 +0200
Subject: [PATCH] Fixed compilation errors
---
libraries/image/CMakeLists.txt | 1 +
libraries/image/src/image/CubeMap.cpp | 5 ++---
libraries/render-utils/src/LightingModel.cpp | 3 +--
libraries/shared/src/TBBHelpers.h | 1 +
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libraries/image/CMakeLists.txt b/libraries/image/CMakeLists.txt
index 0c733ae789..62f48f66e2 100644
--- a/libraries/image/CMakeLists.txt
+++ b/libraries/image/CMakeLists.txt
@@ -2,6 +2,7 @@ set(TARGET_NAME image)
setup_hifi_library()
link_hifi_libraries(shared gpu)
target_nvtt()
+target_tbb()
target_etc2comp()
target_openexr()
diff --git a/libraries/image/src/image/CubeMap.cpp b/libraries/image/src/image/CubeMap.cpp
index 5f54129cdc..fea3477d20 100644
--- a/libraries/image/src/image/CubeMap.cpp
+++ b/libraries/image/src/image/CubeMap.cpp
@@ -11,8 +11,7 @@
#include "CubeMap.h"
#include <cmath>
-#include <tbb/parallel_for.h>
-#include <tbb/blocked_range2d.h>
+#include <TBBHelpers.h>
#include "RandomAndNoise.h"
#include "BRDF.h"
@@ -551,7 +550,7 @@ void CubeMap::generateGGXSamples(GGXSamples& data, float roughness, const int re
float D = ggx::evaluate(NdotH, roughness);
float pdf = (D * NdotH / (4.0f * HdotV)) + 0.0001f;
float saSample = 1.0f / (float(sampleCount) * pdf + 0.0001f);
- float mipLevel = std::max(0.5f * log2(saSample / saTexel) + mipBias, 0.0f);
+ float mipLevel = std::max(0.5f * std::log2(saSample / saTexel) + mipBias, 0.0f);
auto& sample = data.points[sampleIndex];
sample.x = L.x;
diff --git a/libraries/render-utils/src/LightingModel.cpp b/libraries/render-utils/src/LightingModel.cpp
index 5a9ab310c6..5fcec1f033 100644
--- a/libraries/render-utils/src/LightingModel.cpp
+++ b/libraries/render-utils/src/LightingModel.cpp
@@ -14,8 +14,7 @@
#include "render-utils/ShaderConstants.h"
-#include <tbb/parallel_for.h>
-#include <tbb/blocked_range2d.h>
+#include <TBBHelpers.h>
gpu::TexturePointer LightingModel::_ambientFresnelLUT;
diff --git a/libraries/shared/src/TBBHelpers.h b/libraries/shared/src/TBBHelpers.h
index 6b5c4d416b..0c4deace6a 100644
--- a/libraries/shared/src/TBBHelpers.h
+++ b/libraries/shared/src/TBBHelpers.h
@@ -20,6 +20,7 @@
#include <tbb/concurrent_unordered_set.h>
#include <tbb/concurrent_vector.h>
#include <tbb/parallel_for.h>
+#include <tbb/blocked_range2d.h>
#ifdef _WIN32
#pragma warning( pop )