CMake: enabling Android build

4 files changed, 20 insertions, 10 deletions

diff --git a/Graphics/GraphicsTools/CMakeLists.txt b/Graphics/GraphicsTools/CMakeLists.txt
index 17919956..32b1e919 100644
--- a/Graphics/GraphicsTools/CMakeLists.txt
+++ b/Graphics/GraphicsTools/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.6)
 
 project(GraphicsTools CXX)
 
@@ -11,9 +11,6 @@ set(INCLUDE
 	include/RingBuffer.h
 	include/TextureUploader.h
 	include/TextureUploaderBase.h
-	include/TextureUploaderD3D11.h
-	include/TextureUploaderD3D12.h
-	include/TextureUploaderGL.h
 	include/VariableSizeAllocationsManager.h
 	include/VariableSizeGPUAllocationsManager.h
 )
@@ -23,11 +20,22 @@ set(SOURCE
 	src/GraphicsUtilities.cpp
 	src/pch.cpp
 	src/TextureUploader.cpp
-	src/TextureUploaderD3D11.cpp
-	src/TextureUploaderD3D12.cpp
-	src/TextureUploaderGL.cpp
 )
 
+if(D3D11_SUPPORTED)
+	list(APPEND SOURCE src/TextureUploaderD3D11.cpp)
+	list(APPEND INCLUDE include/TextureUploaderD3D11.h)
+endif()
+
+if(D3D12_SUPPORTED)
+	list(APPEND SOURCE src/TextureUploaderD3D12.cpp)
+	list(APPEND INCLUDE include/TextureUploaderD3D12.h)
+endif()
+
+if(GL_SUPPORTED OR GLES_SUPPORTED)
+	list(APPEND SOURCE src/TextureUploaderGL.cpp)
+	list(APPEND INCLUDE include/TextureUploaderGL.h)
+endif()
 
 add_library(GraphicsTools STATIC ${SOURCE} ${INCLUDE})
 
diff --git a/Graphics/GraphicsTools/include/TextureUploaderBase.h b/Graphics/GraphicsTools/include/TextureUploaderBase.h
index 0bd43bcd..4cb6f2ef 100644
--- a/Graphics/GraphicsTools/include/TextureUploaderBase.h
+++ b/Graphics/GraphicsTools/include/TextureUploaderBase.h
@@ -51,7 +51,6 @@ namespace Diligent
         {
         }
 
-        virtual void WaitForCopyScheduled() = 0;
         virtual void* GetDataPtr()   override final { return m_pData; }
         virtual size_t GetRowStride()  const override final{ return m_RowStride;  }
         virtual size_t GetDepthStride()const override final{ return m_DepthStride;  }
diff --git a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
index 23089571..0cae06ac 100644
--- a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
+++ b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
@@ -814,10 +814,10 @@ void GenerateCheckerBoardPatternInternal(Uint32 Width, Uint32 Height, TEXTURE_FO
 static float LinearToSRGB(float x)
 {
 	// This is exactly the sRGB curve
-	//return x < 0.0031308 ? 12.92 * x : 1.055 * pow(abs(x), 1.0 / 2.4) - 0.055;
+	//return x < 0.0031308 ? 12.92 * x : 1.055 * pow(std::abs(x), 1.0 / 2.4) - 0.055;
 	 
 	// This is cheaper but nearly equivalent
-	return x < 0.0031308f ? 12.92f * x : 1.13005f * sqrtf(abs(x - 0.00228f)) - 0.13448f * x + 0.005719f;
+	return x < 0.0031308f ? 12.92f * x : 1.13005f * sqrtf(std::abs(x - 0.00228f)) - 0.13448f * x + 0.005719f;
 }
 
 
diff --git a/Graphics/GraphicsTools/src/TextureUploader.cpp b/Graphics/GraphicsTools/src/TextureUploader.cpp
index f056f162..ddc930ef 100644
--- a/Graphics/GraphicsTools/src/TextureUploader.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploader.cpp
@@ -45,6 +45,9 @@ namespace Diligent
             case DeviceType::OpenGL:
                 *ppUploader = MakeNewRCObj<TextureUploaderGL>()( pDevice, Desc );
                 break;
+            
+            default:
+                UNEXPECTED("Unexpected device type")
         }
         if (*ppUploader != nullptr)
             (*ppUploader)->AddRef();