From ea32c43c8a2e8d18290e7cdd5dc1a5c5e0bbeba9 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 16 Nov 2017 19:39:45 -0800 Subject: Fixed android build --- RenderScript/include/ConvenienceFunctions.h | 2 ++ RenderScript/include/ParsingErrors.h | 2 ++ TextureLoader/src/TextureLoader.cpp | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RenderScript/include/ConvenienceFunctions.h b/RenderScript/include/ConvenienceFunctions.h index 01bcdf4..6134576 100644 --- a/RenderScript/include/ConvenienceFunctions.h +++ b/RenderScript/include/ConvenienceFunctions.h @@ -23,6 +23,8 @@ #pragma once +#include + #include "Errors.h" #include "FileWrapper.h" #include "ScriptParser.h" diff --git a/RenderScript/include/ParsingErrors.h b/RenderScript/include/ParsingErrors.h index d0944a2..662c86f 100644 --- a/RenderScript/include/ParsingErrors.h +++ b/RenderScript/include/ParsingErrors.h @@ -23,6 +23,8 @@ #pragma once +#include + template SSType& operator << (SSType &ss, const std::vector& Arg ) { diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp index cf7a32d..51da064 100644 --- a/TextureLoader/src/TextureLoader.cpp +++ b/TextureLoader/src/TextureLoader.cpp @@ -26,6 +26,7 @@ #include "GraphicsUtilities.h" #include #include +#include #include "DDSLoader.h" using namespace Diligent; @@ -40,7 +41,7 @@ namespace Diligent if( SRGB < 0.04045f ) return SRGB / 12.92f; else - return powf( (SRGB + a) / (1 + a), 2.4f ); + return pow( (SRGB + a) / (1 + a), 2.4f ); } float LinearToSRGB( float c ) -- cgit v1.2.3