diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-11-17 03:39:45 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-11-17 03:39:45 +0000 |
| commit | ea32c43c8a2e8d18290e7cdd5dc1a5c5e0bbeba9 (patch) | |
| tree | 21f4d8345782eb6ebd30977c4ad035ca01ac12a6 | |
| parent | Updated to version 2.1 (diff) | |
| download | DiligentTools-ea32c43c8a2e8d18290e7cdd5dc1a5c5e0bbeba9.tar.gz DiligentTools-ea32c43c8a2e8d18290e7cdd5dc1a5c5e0bbeba9.zip | |
Fixed android build
| -rw-r--r-- | RenderScript/include/ConvenienceFunctions.h | 2 | ||||
| -rw-r--r-- | RenderScript/include/ParsingErrors.h | 2 | ||||
| -rw-r--r-- | TextureLoader/src/TextureLoader.cpp | 3 |
3 files changed, 6 insertions, 1 deletions
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 <string> + #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 <vector> + template<typename SSType> SSType& operator << (SSType &ss, const std::vector<Diligent::String>& 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 <algorithm> #include <limits> +#include <math.h> #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 ) |