Fixed formatting of cmake files + couple of minor updates

9 files changed, 473 insertions, 469 deletions

diff --git a/Graphics/GraphicsAccessories/CMakeLists.txt b/Graphics/GraphicsAccessories/CMakeLists.txt
index 7490ab90..8bf7d501 100644
--- a/Graphics/GraphicsAccessories/CMakeLists.txt
+++ b/Graphics/GraphicsAccessories/CMakeLists.txt
@@ -3,29 +3,29 @@ cmake_minimum_required (VERSION 3.6)
 project(GraphicsAccessories CXX)
 
 set(INTERFACE 
-	interface/RingBuffer.h
-	interface/VariableSizeAllocationsManager.h
-	interface/VariableSizeGPUAllocationsManager.h
-	interface/GraphicsAccessories.h
+    interface/RingBuffer.h
+    interface/VariableSizeAllocationsManager.h
+    interface/VariableSizeGPUAllocationsManager.h
+    interface/GraphicsAccessories.h
 )
 
 set(SOURCE 
-	src/test.cpp
-	src/GraphicsAccessories.cpp
+    src/test.cpp
+    src/GraphicsAccessories.cpp
 )
 
 add_library(GraphicsAccessories STATIC ${SOURCE} ${INTERFACE})
 
 target_include_directories(GraphicsAccessories 
 PUBLIC
-	interface
+    interface
 )
 
 target_link_libraries(GraphicsAccessories 
 PUBLIC
-	BuildSettings
-	Common 
-	GraphicsEngineInterface
+    BuildSettings
+    Common 
+    GraphicsEngineInterface
 )
 
 set_common_target_properties(GraphicsAccessories)
@@ -34,5 +34,5 @@ source_group("src" FILES ${SOURCE})
 source_group("interface" FILES ${INTERFACE})
 
 set_target_properties(GraphicsAccessories PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
diff --git a/Graphics/GraphicsEngine/CMakeLists.txt b/Graphics/GraphicsEngine/CMakeLists.txt
index ec24e4ab..c226701e 100644
--- a/Graphics/GraphicsEngine/CMakeLists.txt
+++ b/Graphics/GraphicsEngine/CMakeLists.txt
@@ -3,55 +3,55 @@ cmake_minimum_required (VERSION 3.6)
 project(GraphicsEngine CXX)
 
 set(INCLUDE 
-	include/BufferBase.h
-	include/BufferViewBase.h
-	include/CommandListBase.h
-	include/Defines.h
-	include/DeviceContextBase.h
-	include/DeviceObjectBase.h
-	include/EngineMemory.h
-	include/pch.h
-	include/PipelineStateBase.h
-	include/RenderDeviceBase.h
-	include/ResourceMappingImpl.h
-	include/SamplerBase.h
-	include/ShaderBase.h
-	include/ShaderResourceBindingBase.h
-	include/StateObjectsRegistry.h
-	include/SwapChainBase.h
-	include/TextureBase.h
-	include/TextureViewBase.h
+    include/BufferBase.h
+    include/BufferViewBase.h
+    include/CommandListBase.h
+    include/Defines.h
+    include/DeviceContextBase.h
+    include/DeviceObjectBase.h
+    include/EngineMemory.h
+    include/pch.h
+    include/PipelineStateBase.h
+    include/RenderDeviceBase.h
+    include/ResourceMappingImpl.h
+    include/SamplerBase.h
+    include/ShaderBase.h
+    include/ShaderResourceBindingBase.h
+    include/StateObjectsRegistry.h
+    include/SwapChainBase.h
+    include/TextureBase.h
+    include/TextureViewBase.h
 )
 
 set(INTERFACE 
-	interface/BlendState.h
-	interface/Buffer.h
-	interface/BufferView.h
-	interface/CommandList.h
-	interface/Constants.h
-	interface/DepthStencilState.h
-	interface/DeviceCaps.h
-	interface/DeviceContext.h
-	interface/DeviceObject.h
-	interface/GraphicsTypes.h
-	interface/InputLayout.h
-	interface/MapHelper.h
-	interface/PipelineState.h
-	interface/RasterizerState.h
-	interface/RenderDevice.h
-	interface/ResourceMapping.h
-	interface/Sampler.h
-	interface/Shader.h
-	interface/ShaderResourceBinding.h
-	interface/SwapChain.h
-	interface/Texture.h
-	interface/TextureView.h
+    interface/BlendState.h
+    interface/Buffer.h
+    interface/BufferView.h
+    interface/CommandList.h
+    interface/Constants.h
+    interface/DepthStencilState.h
+    interface/DeviceCaps.h
+    interface/DeviceContext.h
+    interface/DeviceObject.h
+    interface/GraphicsTypes.h
+    interface/InputLayout.h
+    interface/MapHelper.h
+    interface/PipelineState.h
+    interface/RasterizerState.h
+    interface/RenderDevice.h
+    interface/ResourceMapping.h
+    interface/Sampler.h
+    interface/Shader.h
+    interface/ShaderResourceBinding.h
+    interface/SwapChain.h
+    interface/Texture.h
+    interface/TextureView.h
 )
 
 set(SOURCE 
-	src/EngineMemory.cpp
-	src/ResourceMapping.cpp
-	src/Texture.cpp
+    src/EngineMemory.cpp
+    src/ResourceMapping.cpp
+    src/Texture.cpp
 )
 
 add_library(GraphicsEngine STATIC ${SOURCE} ${INTERFACE} ${INCLUDE})
@@ -59,16 +59,16 @@ set_common_target_properties(GraphicsEngine)
 
 target_include_directories(GraphicsEngine 
 PUBLIC
-	include
-	interface
+    include
+    interface
 )
 
 target_link_libraries(GraphicsEngine 
 PUBLIC
-	BuildSettings 
-	PlatformInterface 
-	Common
-	GraphicsAccessories
+    BuildSettings 
+    PlatformInterface 
+    Common
+    GraphicsAccessories
 )
 
 source_group("src" FILES ${SOURCE})
@@ -76,5 +76,5 @@ source_group("include" FILES ${INCLUDE})
 source_group("interface" FILES ${INTERFACE})
 
 set_target_properties(GraphicsEngine PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
index a26247ac..16f62cf6 100644
--- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
@@ -4,101 +4,101 @@ project(GraphicsEngineD3D11 CXX)
 
 
 set(INCLUDE 
-	include/BufferD3D11Impl.h
-	include/BufferViewD3D11Impl.h
-	include/CommandListD3D11Impl.h
-	include/D3D11DebugUtilities.h
-	include/D3D11TypeConversions.h
-	include/D3D11TypeDefinitions.h
-	include/DeviceContextD3D11Impl.h
-	include/EngineD3D11Defines.h
-	include/pch.h
-	include/PipelineStateD3D11Impl.h
-	include/RenderDeviceD3D11Impl.h
-	include/SamplerD3D11Impl.h
-	include/ShaderD3D11Impl.h
-	include/ShaderResourceBindingD3D11Impl.h
-	include/ShaderResourceCacheD3D11.h
-	include/ShaderResourceLayoutD3D11.h
-	include/ShaderResourcesD3D11.h
-	include/SwapChainD3D11Impl.h
-	include/targetver.h
-	include/Texture1D_D3D11.h
-	include/Texture2D_D3D11.h
-	include/Texture3D_D3D11.h
-	include/TextureBaseD3D11.h
-	include/TextureViewD3D11Impl.h
+    include/BufferD3D11Impl.h
+    include/BufferViewD3D11Impl.h
+    include/CommandListD3D11Impl.h
+    include/D3D11DebugUtilities.h
+    include/D3D11TypeConversions.h
+    include/D3D11TypeDefinitions.h
+    include/DeviceContextD3D11Impl.h
+    include/EngineD3D11Defines.h
+    include/pch.h
+    include/PipelineStateD3D11Impl.h
+    include/RenderDeviceD3D11Impl.h
+    include/SamplerD3D11Impl.h
+    include/ShaderD3D11Impl.h
+    include/ShaderResourceBindingD3D11Impl.h
+    include/ShaderResourceCacheD3D11.h
+    include/ShaderResourceLayoutD3D11.h
+    include/ShaderResourcesD3D11.h
+    include/SwapChainD3D11Impl.h
+    include/targetver.h
+    include/Texture1D_D3D11.h
+    include/Texture2D_D3D11.h
+    include/Texture3D_D3D11.h
+    include/TextureBaseD3D11.h
+    include/TextureViewD3D11Impl.h
 )
 
 set(INTERFACE 
-	interface/BufferD3D11.h
-	interface/BufferViewD3D11.h
-	interface/DeviceContextD3D11.h
-	interface/EngineD3D11Attribs.h
-	interface/PipelineStateD3D11.h
-	interface/RenderDeviceD3D11.h
-	interface/RenderDeviceFactoryD3D11.h
-	interface/SamplerD3D11.h
-	interface/ShaderD3D11.h
-	interface/ShaderResourceBindingD3D11.h
-	interface/SwapChainD3D11.h
-	interface/TextureD3D11.h
-	interface/TextureViewD3D11.h
+    interface/BufferD3D11.h
+    interface/BufferViewD3D11.h
+    interface/DeviceContextD3D11.h
+    interface/EngineD3D11Attribs.h
+    interface/PipelineStateD3D11.h
+    interface/RenderDeviceD3D11.h
+    interface/RenderDeviceFactoryD3D11.h
+    interface/SamplerD3D11.h
+    interface/ShaderD3D11.h
+    interface/ShaderResourceBindingD3D11.h
+    interface/SwapChainD3D11.h
+    interface/TextureD3D11.h
+    interface/TextureViewD3D11.h
 )
 
 
 set(SRC 
-	src/BufferD3D11Impl.cpp
-	src/BufferViewD3D11Impl.cpp
-	src/CommandListD3D11Impl.cpp
-	src/D3D11DebugUtilities.cpp
-	src/D3D11TypeConversions.cpp
-	src/DeviceContextD3D11Impl.cpp
-	src/PipelineStateD3D11Impl.cpp
-	src/RenderDeviceD3D11Impl.cpp
-	src/RenderDeviceFactoryD3D11.cpp
-	src/SamplerD3D11Impl.cpp
-	src/ShaderD3D11Impl.cpp
-	src/ShaderResourceBindingD3D11Impl.cpp
-	src/ShaderResourceCacheD3D11.cpp
-	src/ShaderResourceLayoutD3D11.cpp
-	src/ShaderResourcesD3D11.cpp
-	src/SwapChainD3D11Impl.cpp
-	src/Texture1D_D3D11.cpp
-	src/Texture2D_D3D11.cpp
-	src/Texture3D_D3D11.cpp
-	src/TextureBaseD3D11.cpp
-	src/TextureViewD3D11Impl.cpp
+    src/BufferD3D11Impl.cpp
+    src/BufferViewD3D11Impl.cpp
+    src/CommandListD3D11Impl.cpp
+    src/D3D11DebugUtilities.cpp
+    src/D3D11TypeConversions.cpp
+    src/DeviceContextD3D11Impl.cpp
+    src/PipelineStateD3D11Impl.cpp
+    src/RenderDeviceD3D11Impl.cpp
+    src/RenderDeviceFactoryD3D11.cpp
+    src/SamplerD3D11Impl.cpp
+    src/ShaderD3D11Impl.cpp
+    src/ShaderResourceBindingD3D11Impl.cpp
+    src/ShaderResourceCacheD3D11.cpp
+    src/ShaderResourceLayoutD3D11.cpp
+    src/ShaderResourcesD3D11.cpp
+    src/SwapChainD3D11Impl.cpp
+    src/Texture1D_D3D11.cpp
+    src/Texture2D_D3D11.cpp
+    src/Texture3D_D3D11.cpp
+    src/TextureBaseD3D11.cpp
+    src/TextureViewD3D11Impl.cpp
 )
 
 add_library(GraphicsEngineD3D11Interface INTERFACE)
 target_include_directories(GraphicsEngineD3D11Interface
 INTERFACE
-	interface
+    interface
 )
 target_link_libraries(GraphicsEngineD3D11Interface 
 INTERFACE 
-	GraphicsEngineInterface
+    GraphicsEngineInterface
 )
 
 
 add_library(GraphicsEngineD3D11-static STATIC 
-	${SRC} ${INTERFACE} ${INCLUDE}
-	readme.md
+    ${SRC} ${INTERFACE} ${INCLUDE}
+    readme.md
 )
 
 add_library(GraphicsEngineD3D11-shared SHARED 
-	${SRC} ${INTERFACE} ${INCLUDE}
-	src/DLLMain.cpp
-	src/GraphicsEngineD3D11.def
-	readme.md
+    ${SRC} ${INTERFACE} ${INCLUDE}
+    src/DLLMain.cpp
+    src/GraphicsEngineD3D11.def
+    readme.md
 )
 
 set_target_properties(GraphicsEngineD3D11-shared PROPERTIES
-	OUTPUT_NAME_DEBUG GraphicsEngineD3D11${DLL_DBG_SUFFIX}
-	OUTPUT_NAME_RELEASE GraphicsEngineD3D11${DLL_REL_SUFFIX}
-	OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineD3D11${DLL_REL_SUFFIX}
-	OUTPUT_NAME_MINSIZEREL GraphicsEngineD3D11${DLL_REL_SUFFIX}
+    OUTPUT_NAME_DEBUG GraphicsEngineD3D11${DLL_DBG_SUFFIX}
+    OUTPUT_NAME_RELEASE GraphicsEngineD3D11${DLL_REL_SUFFIX}
+    OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineD3D11${DLL_REL_SUFFIX}
+    OUTPUT_NAME_MINSIZEREL GraphicsEngineD3D11${DLL_REL_SUFFIX}
 )
 
 set_common_target_properties(GraphicsEngineD3D11-shared)
@@ -106,25 +106,25 @@ set_common_target_properties(GraphicsEngineD3D11-static)
 
 target_include_directories(GraphicsEngineD3D11-static 
 PRIVATE
-	include
+    include
 )
 
 target_include_directories(GraphicsEngineD3D11-shared
 PRIVATE
-	include
+    include
 )
 
 set(PRIVATE_DEPENDENCIES 
-	BuildSettings 
-	GraphicsEngineD3DBase 
-	TargetPlatform
-	Common
-	d3d11.lib 
-	d3dcompiler.lib
+    BuildSettings 
+    GraphicsEngineD3DBase 
+    TargetPlatform
+    Common
+    d3d11.lib 
+    d3dcompiler.lib
 )
 
 set(PUBLIC_DEPENDENCIES 
-	GraphicsEngineD3D11Interface
+    GraphicsEngineD3D11Interface
 )
 
 target_link_libraries(GraphicsEngineD3D11-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES})
@@ -135,18 +135,18 @@ target_compile_definitions(GraphicsEngineD3D11-shared PUBLIC ENGINE_DLL=1)
 source_group("src" FILES ${SRC} )
 
 source_group("dll" FILES 
-	src/DLLMain.cpp
-	src/GraphicsEngineD3D11.def
+    src/DLLMain.cpp
+    src/GraphicsEngineD3D11.def
 )
 
 source_group("include" FILES ${INCLUDE})
 source_group("interface" FILES ${INTERFACE})
 
 set_target_properties(GraphicsEngineD3D11-static PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 set_target_properties(GraphicsEngineD3D11-shared PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 
 set_source_files_properties(
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
index fadf9fba..850bec5c 100644
--- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
@@ -3,149 +3,149 @@ cmake_minimum_required (VERSION 3.10)
 project(GraphicsEngineD3D12 CXX)
 
 set(INCLUDE 
-	include/BufferD3D12Impl.h
-	include/BufferViewD3D12Impl.h
-	include/CommandContext.h
-	include/CommandListD3D12Impl.h
-	include/CommandListManager.h
-	include/CommandQueueD3D12Impl.h
-	include/D3D12ResourceBase.h
-	include/D3D12TypeConversions.h
-	include/D3D12TypeDefinitions.h
-	include/D3D12Utils.h
-	include/d3dx12_win.h
-	include/DescriptorHeap.h
-	include/DeviceContextD3D12Impl.h
-	include/DynamicUploadHeap.h
-	include/GenerateMips.h
-	include/pch.h
-	include/PipelineStateD3D12Impl.h
-	include/RenderDeviceD3D12Impl.h
-	include/RootSignature.h
-	include/SamplerD3D12Impl.h
-	include/ShaderD3D12Impl.h
-	include/ShaderResourceBindingD3D12Impl.h
-	include/ShaderResourceCacheD3D12.h
-	include/ShaderResourceLayoutD3D12.h
-	include/ShaderResourcesD3D12.h
-	include/SwapChainD3D12Impl.h
-	include/TextureD3D12Impl.h
-	include/TextureViewD3D12Impl.h
+    include/BufferD3D12Impl.h
+    include/BufferViewD3D12Impl.h
+    include/CommandContext.h
+    include/CommandListD3D12Impl.h
+    include/CommandListManager.h
+    include/CommandQueueD3D12Impl.h
+    include/D3D12ResourceBase.h
+    include/D3D12TypeConversions.h
+    include/D3D12TypeDefinitions.h
+    include/D3D12Utils.h
+    include/d3dx12_win.h
+    include/DescriptorHeap.h
+    include/DeviceContextD3D12Impl.h
+    include/DynamicUploadHeap.h
+    include/GenerateMips.h
+    include/pch.h
+    include/PipelineStateD3D12Impl.h
+    include/RenderDeviceD3D12Impl.h
+    include/RootSignature.h
+    include/SamplerD3D12Impl.h
+    include/ShaderD3D12Impl.h
+    include/ShaderResourceBindingD3D12Impl.h
+    include/ShaderResourceCacheD3D12.h
+    include/ShaderResourceLayoutD3D12.h
+    include/ShaderResourcesD3D12.h
+    include/SwapChainD3D12Impl.h
+    include/TextureD3D12Impl.h
+    include/TextureViewD3D12Impl.h
 )
 
 set(INTERFACE 
-	interface/BufferD3D12.h
-	interface/BufferViewD3D12.h
-	interface/CommandQueueD3D12.h
-	interface/DeviceContextD3D12.h
-	interface/PipelineStateD3D12.h
-	interface/RenderDeviceD3D12.h
-	interface/RenderDeviceFactoryD3D12.h
-	interface/SamplerD3D12.h
-	interface/ShaderD3D12.h
-	interface/ShaderResourceBindingD3D12.h
-	interface/SwapChainD3D12.h
-	interface/TextureD3D12.h
-	interface/TextureViewD3D12.h
+    interface/BufferD3D12.h
+    interface/BufferViewD3D12.h
+    interface/CommandQueueD3D12.h
+    interface/DeviceContextD3D12.h
+    interface/PipelineStateD3D12.h
+    interface/RenderDeviceD3D12.h
+    interface/RenderDeviceFactoryD3D12.h
+    interface/SamplerD3D12.h
+    interface/ShaderD3D12.h
+    interface/ShaderResourceBindingD3D12.h
+    interface/SwapChainD3D12.h
+    interface/TextureD3D12.h
+    interface/TextureViewD3D12.h
 )
 
 
 set(SRC 
-	src/BufferD3D12Impl.cpp
-	src/BufferViewD3D12Impl.cpp
-	src/CommandContext.cpp
-	src/CommandListManager.cpp
-	src/CommandQueueD3D12Impl.cpp
-	src/D3D12ResourceBase.cpp
-	src/D3D12TypeConversions.cpp
-	src/D3D12Utils.cpp
-	src/DescriptorHeap.cpp
-	src/DeviceContextD3D12Impl.cpp
-	src/DynamicUploadHeap.cpp
-	src/GenerateMips.cpp
-	src/PipelineStateD3D12Impl.cpp
-	src/RenderDeviceD3D12Impl.cpp
-	src/RenderDeviceFactoryD3D12.cpp
-	src/RootSignature.cpp
-	src/SamplerD3D12Impl.cpp
-	src/ShaderD3D12Impl.cpp
-	src/ShaderResourceBindingD3D12Impl.cpp
-	src/ShaderResourceCacheD3D12.cpp
-	src/ShaderResourceLayoutD3D12.cpp
-	src/ShaderResourcesD3D12.cpp
-	src/SwapChainD3D12Impl.cpp
-	src/TextureD3D12Impl.cpp
-	src/TextureViewD3D12Impl.cpp
+    src/BufferD3D12Impl.cpp
+    src/BufferViewD3D12Impl.cpp
+    src/CommandContext.cpp
+    src/CommandListManager.cpp
+    src/CommandQueueD3D12Impl.cpp
+    src/D3D12ResourceBase.cpp
+    src/D3D12TypeConversions.cpp
+    src/D3D12Utils.cpp
+    src/DescriptorHeap.cpp
+    src/DeviceContextD3D12Impl.cpp
+    src/DynamicUploadHeap.cpp
+    src/GenerateMips.cpp
+    src/PipelineStateD3D12Impl.cpp
+    src/RenderDeviceD3D12Impl.cpp
+    src/RenderDeviceFactoryD3D12.cpp
+    src/RootSignature.cpp
+    src/SamplerD3D12Impl.cpp
+    src/ShaderD3D12Impl.cpp
+    src/ShaderResourceBindingD3D12Impl.cpp
+    src/ShaderResourceCacheD3D12.cpp
+    src/ShaderResourceLayoutD3D12.cpp
+    src/ShaderResourcesD3D12.cpp
+    src/SwapChainD3D12Impl.cpp
+    src/TextureD3D12Impl.cpp
+    src/TextureViewD3D12Impl.cpp
 )
 
 set(SHADERS
-	shaders/GenerateMips/GenerateMipsGammaCS.hlsl
-	shaders/GenerateMips/GenerateMipsGammaOddCS.hlsl
-	shaders/GenerateMips/GenerateMipsGammaOddXCS.hlsl
-	shaders/GenerateMips/GenerateMipsGammaOddYCS.hlsl
-	shaders/GenerateMips/GenerateMipsLinearCS.hlsl
-	shaders/GenerateMips/GenerateMipsLinearOddCS.hlsl
-	shaders/GenerateMips/GenerateMipsLinearOddXCS.hlsl
-	shaders/GenerateMips/GenerateMipsLinearOddYCS.hlsl
+    shaders/GenerateMips/GenerateMipsGammaCS.hlsl
+    shaders/GenerateMips/GenerateMipsGammaOddCS.hlsl
+    shaders/GenerateMips/GenerateMipsGammaOddXCS.hlsl
+    shaders/GenerateMips/GenerateMipsGammaOddYCS.hlsl
+    shaders/GenerateMips/GenerateMipsLinearCS.hlsl
+    shaders/GenerateMips/GenerateMipsLinearOddCS.hlsl
+    shaders/GenerateMips/GenerateMipsLinearOddXCS.hlsl
+    shaders/GenerateMips/GenerateMipsLinearOddYCS.hlsl
 )
 
 set_source_files_properties(${SHADERS} PROPERTIES 
-	VS_SHADER_TYPE Compute
-	VS_SHADER_ENTRYPOINT main
-	VS_SHADER_MODEL 5.0
-	VS_SHADER_VARIABLE_NAME "g_p%(Filename)"
-	VS_SHADER_OUTPUT_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders/GenerateMips/%(Filename).h"
-	#VS_SHADER_FLAGS "/O3"
+    VS_SHADER_TYPE Compute
+    VS_SHADER_ENTRYPOINT main
+    VS_SHADER_MODEL 5.0
+    VS_SHADER_VARIABLE_NAME "g_p%(Filename)"
+    VS_SHADER_OUTPUT_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders/GenerateMips/%(Filename).h"
+    #VS_SHADER_FLAGS "/O3"
 )
 
 add_library(GraphicsEngineD3D12Interface INTERFACE)
 target_include_directories(GraphicsEngineD3D12Interface
 INTERFACE
-	interface
+    interface
 )
 target_link_libraries(GraphicsEngineD3D12Interface 
 INTERFACE 
-	GraphicsEngineInterface
+    GraphicsEngineInterface
 )
 
 add_library(GraphicsEngineD3D12-static STATIC 
-	${SRC} ${INTERFACE} ${INCLUDE} ${SHADERS}
-	readme.md
-	shaders/GenerateMips/GenerateMipsCS.hlsli
+    ${SRC} ${INTERFACE} ${INCLUDE} ${SHADERS}
+    readme.md
+    shaders/GenerateMips/GenerateMipsCS.hlsli
 )
 
 add_library(GraphicsEngineD3D12-shared SHARED 
-	${SRC} ${INTERFACE} ${INCLUDE} ${SHADERS}
-	src/DLLMain.cpp
-	src/GraphicsEngineD3D12.def
-	readme.md
-	shaders/GenerateMips/GenerateMipsCS.hlsli
+    ${SRC} ${INTERFACE} ${INCLUDE} ${SHADERS}
+    src/DLLMain.cpp
+    src/GraphicsEngineD3D12.def
+    readme.md
+    shaders/GenerateMips/GenerateMipsCS.hlsli
 )
 
 target_include_directories(GraphicsEngineD3D12-static 
 PRIVATE
-	${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders
-	include
+    ${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders
+    include
 )
 
 target_include_directories(GraphicsEngineD3D12-shared 
 PRIVATE
-	${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders
-	include
+    ${CMAKE_CURRENT_BINARY_DIR}/CompiledShaders
+    include
 )
 
 set(PRIVATE_DEPENDENCIES 
-	BuildSettings 
-	Common 
-	GraphicsEngineD3DBase 
-	TargetPlatform 
-	dxgi.lib
-	D3D12.lib 
-	d3dcompiler.lib
+    BuildSettings 
+    Common 
+    GraphicsEngineD3DBase 
+    TargetPlatform 
+    dxgi.lib
+    D3D12.lib 
+    d3dcompiler.lib
 )
 
 set(PUBLIC_DEPENDENCIES 
-	GraphicsEngineD3D12Interface
+    GraphicsEngineD3D12Interface
 )
 
 target_link_libraries(GraphicsEngineD3D12-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES})
@@ -154,10 +154,10 @@ target_link_libraries(GraphicsEngineD3D12-shared PRIVATE ${PRIVATE_DEPENDENCIES}
 target_compile_definitions(GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL=1)
 
 set_target_properties(GraphicsEngineD3D12-shared PROPERTIES
-	OUTPUT_NAME_DEBUG GraphicsEngineD3D12${DLL_DBG_SUFFIX}
-	OUTPUT_NAME_RELEASE GraphicsEngineD3D12${DLL_REL_SUFFIX}
-	OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineD3D12${DLL_REL_SUFFIX}
-	OUTPUT_NAME_MINSIZEREL GraphicsEngineD3D12${DLL_REL_SUFFIX}
+    OUTPUT_NAME_DEBUG GraphicsEngineD3D12${DLL_DBG_SUFFIX}
+    OUTPUT_NAME_RELEASE GraphicsEngineD3D12${DLL_REL_SUFFIX}
+    OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineD3D12${DLL_REL_SUFFIX}
+    OUTPUT_NAME_MINSIZEREL GraphicsEngineD3D12${DLL_REL_SUFFIX}
 )
 
 set_common_target_properties(GraphicsEngineD3D12-shared)
@@ -166,22 +166,22 @@ set_common_target_properties(GraphicsEngineD3D12-static)
 source_group("src" FILES ${SRC})
 
 source_group("dll" FILES 
-	src/DLLMain.cpp
-	src/GraphicsEngineD3D12.def
+    src/DLLMain.cpp
+    src/GraphicsEngineD3D12.def
 )
 
 source_group("include" FILES ${INCLUDE})
 source_group("interface" FILES ${INTERFACE})
 source_group("shaders" FILES 
-	${SHADERS}
-	shaders/GenerateMips/GenerateMipsCS.hlsli
+    ${SHADERS}
+    shaders/GenerateMips/GenerateMipsCS.hlsli
 )
 
 set_target_properties(GraphicsEngineD3D12-static PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 set_target_properties(GraphicsEngineD3D12-shared PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 
 set_source_files_properties(
diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
index 33fd7a76..ee5066ba 100644
--- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
@@ -3,26 +3,26 @@ cmake_minimum_required (VERSION 3.10)
 project(GraphicsEngineD3DBase CXX)
 
 set(INCLUDE 
-	include/D3DErrors.h
-	include/D3DShaderResourceLoader.h
-	include/D3DTypeConversionImpl.h
-	include/D3DViewDescConversionImpl.h
-	include/DXGITypeConversions.h
-	include/HLSLDefinitions.fxh
-	include/RenderDeviceD3DBase.h
-	include/ShaderD3DBase.h
-	include/ShaderResources.h
-	include/ShaderVariableD3DBase.h
+    include/D3DErrors.h
+    include/D3DShaderResourceLoader.h
+    include/D3DTypeConversionImpl.h
+    include/D3DViewDescConversionImpl.h
+    include/DXGITypeConversions.h
+    include/HLSLDefinitions.fxh
+    include/RenderDeviceD3DBase.h
+    include/ShaderD3DBase.h
+    include/ShaderResources.h
+    include/ShaderVariableD3DBase.h
 )
 
 set(SOURCE 
-	src/DXGITypeConversions.cpp
-	src/ShaderD3DBase.cpp
-	src/ShaderResources.cpp
+    src/DXGITypeConversions.cpp
+    src/ShaderD3DBase.cpp
+    src/ShaderResources.cpp
 )
 
 add_library(GraphicsEngineD3DBase STATIC 
-	${SOURCE} ${INCLUDE} include/HLSLDefinitions_inc.fxh
+    ${SOURCE} ${INCLUDE} include/HLSLDefinitions_inc.fxh
 )
 
 set_source_files_properties(
@@ -33,15 +33,15 @@ set_source_files_properties(
 # Create custom target to convert HLSLDefinitions.fxh to HLSLDefinitions_inc.fxh
 add_custom_target(ProcessHLSLDefinitions
 SOURCES
-	include/HLSLDefinitions.fxh
+    include/HLSLDefinitions.fxh
 )
 
 add_custom_command(TARGET ProcessHLSLDefinitions 
-				   # Unfortunately it is not possible to set TARGET directly to GraphicsEngineD3DBase
-				   # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators 
-				   # PRE_BUILD is treated as PRE_LINK.
+                   # Unfortunately it is not possible to set TARGET directly to GraphicsEngineD3DBase
+                   # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators 
+                   # PRE_BUILD is treated as PRE_LINK.
                    COMMAND ${FILE2STRING_PATH} include/HLSLDefinitions.fxh include/HLSLDefinitions_inc.fxh
-				   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                    COMMENT "Processing HLSLDefinitions.fxh"
                    VERBATIM
 )
@@ -50,13 +50,13 @@ add_dependencies(GraphicsEngineD3DBase ProcessHLSLDefinitions)
 
 target_include_directories(GraphicsEngineD3DBase
 PUBLIC
-	include
+    include
 )
 
 target_link_libraries(GraphicsEngineD3DBase 
 PUBLIC
-	BuildSettings 
-	GraphicsEngine 
+    BuildSettings 
+    GraphicsEngine 
 )
 set_common_target_properties(GraphicsEngineD3DBase)
 
@@ -65,8 +65,8 @@ source_group("include" FILES ${INCLUDE})
 source_group("generated" FILES include/HLSLDefinitions_inc.fxh)
 
 set_target_properties(GraphicsEngineD3DBase PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 set_target_properties(ProcessHLSLDefinitions PROPERTIES
-	FOLDER Core/Graphics/Helper
+    FOLDER Core/Graphics/Helper
 )
\ No newline at end of file
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
index 02196fc7..d867df43 100644
--- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
+++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -3,185 +3,189 @@ cmake_minimum_required (VERSION 3.3)
 project(GraphicsEngineOpenGL CXX)
 
 set(INCLUDE 
-	include/AsyncWritableResource.h
-	include/BufferGLImpl.h
-	include/BufferViewGLImpl.h
-	include/DeviceContextGLImpl.h 
-	include/FBOCache.h
-	include/GLContext.h
-	include/GLContextState.h
-	include/GLObjectWrapper.h
-	include/GLProgram.h
-	include/GLProgramResources.h
-	include/GLTypeConversions.h
-	include/pch.h
-	include/PipelineStateGLImpl.h
-	include/RenderDeviceGLImpl.h
-	include/SamplerGLImpl.h
-	include/ShaderGLImpl.h
-	include/ShaderResourceBindingGLImpl.h
-	include/TexRegionRender.h
-	include/Texture1D_OGL.h
-	include/Texture1DArray_OGL.h
-	include/Texture2D_OGL.h
-	include/Texture2DArray_OGL.h
-	include/Texture3D_OGL.h
-	include/TextureBaseGL.h
-	include/TextureCube_OGL.h
-	include/TextureCubeArray_OGL.h
-	include/TextureViewGLImpl.h
-	include/VAOCache.h
+    include/AsyncWritableResource.h
+    include/BufferGLImpl.h
+    include/BufferViewGLImpl.h
+    include/DeviceContextGLImpl.h 
+    include/FBOCache.h
+    include/GLContext.h
+    include/GLContextState.h
+    include/GLObjectWrapper.h
+    include/GLProgram.h
+    include/GLProgramResources.h
+    include/GLTypeConversions.h
+    include/pch.h
+    include/PipelineStateGLImpl.h
+    include/RenderDeviceGLImpl.h
+    include/SamplerGLImpl.h
+    include/ShaderGLImpl.h
+    include/ShaderResourceBindingGLImpl.h
+    include/TexRegionRender.h
+    include/Texture1D_OGL.h
+    include/Texture1DArray_OGL.h
+    include/Texture2D_OGL.h
+    include/Texture2DArray_OGL.h
+    include/Texture3D_OGL.h
+    include/TextureBaseGL.h
+    include/TextureCube_OGL.h
+    include/TextureCubeArray_OGL.h
+    include/TextureViewGLImpl.h
+    include/VAOCache.h
 )
 
 set(INTERFACE 
-	interface/BaseInterfacesGL.h
-	interface/BufferGL.h
-	interface/BufferViewGL.h
-	interface/DeviceContextGL.h
-	interface/EngineGLAttribs.h
-	interface/PipelineStateGL.h
-	interface/RenderDeviceFactoryOpenGL.h
-	interface/RenderDeviceGL.h
-	interface/SamplerGL.h
-	interface/ShaderGL.h
-	interface/ShaderResourceBindingGL.h
-	interface/SwapChainGL.h
-	interface/TextureGL.h
-	interface/TextureViewGL.h
+    interface/BaseInterfacesGL.h
+    interface/BufferGL.h
+    interface/BufferViewGL.h
+    interface/DeviceContextGL.h
+    interface/EngineGLAttribs.h
+    interface/PipelineStateGL.h
+    interface/RenderDeviceFactoryOpenGL.h
+    interface/RenderDeviceGL.h
+    interface/SamplerGL.h
+    interface/ShaderGL.h
+    interface/ShaderResourceBindingGL.h
+    interface/SwapChainGL.h
+    interface/TextureGL.h
+    interface/TextureViewGL.h
 )
 
 set(SOURCE 
-	src/BufferGLImpl.cpp
-	src/BufferViewGLImpl.cpp
-	src/DeviceContextGLImpl.cpp
-	src/FBOCache.cpp
-	src/GLContextState.cpp
-	src/GLObjectWrapper.cpp
-	src/GLProgram.cpp
-	src/GLProgramResources.cpp
-	src/GLTypeConversions.cpp
-	src/PipelineStateGLImpl.cpp
-	src/RenderDeviceFactoryOpenGL.cpp
-	src/RenderDeviceGLImpl.cpp
-	src/SamplerGLImpl.cpp
-	src/ShaderGLImpl.cpp
-	src/ShaderResourceBindingGLImpl.cpp
-	src/TexRegionRender.cpp
-	src/Texture1D_OGL.cpp
-	src/Texture1DArray_OGL.cpp
-	src/Texture2D_OGL.cpp
-	src/Texture2DArray_OGL.cpp
-	src/Texture3D_OGL.cpp
-	src/TextureBaseGL.cpp
-	src/TextureCube_OGL.cpp
-	src/TextureCubeArray_OGL.cpp
-	src/TextureViewGLImpl.cpp
-	src/VAOCache.cpp
+    src/BufferGLImpl.cpp
+    src/BufferViewGLImpl.cpp
+    src/DeviceContextGLImpl.cpp
+    src/FBOCache.cpp
+    src/GLContextState.cpp
+    src/GLObjectWrapper.cpp
+    src/GLProgram.cpp
+    src/GLProgramResources.cpp
+    src/GLTypeConversions.cpp
+    src/PipelineStateGLImpl.cpp
+    src/RenderDeviceFactoryOpenGL.cpp
+    src/RenderDeviceGLImpl.cpp
+    src/SamplerGLImpl.cpp
+    src/ShaderGLImpl.cpp
+    src/ShaderResourceBindingGLImpl.cpp
+    src/TexRegionRender.cpp
+    src/Texture1D_OGL.cpp
+    src/Texture1DArray_OGL.cpp
+    src/Texture2D_OGL.cpp
+    src/Texture2DArray_OGL.cpp
+    src/Texture3D_OGL.cpp
+    src/TextureBaseGL.cpp
+    src/TextureCube_OGL.cpp
+    src/TextureCubeArray_OGL.cpp
+    src/TextureViewGLImpl.cpp
+    src/VAOCache.cpp
 )
 
 if(PLATFORM_WIN32)
-	list(APPEND SOURCE src/GLContextWindows.cpp)
+    list(APPEND SOURCE src/GLContextWindows.cpp)
     list(APPEND SOURCE src/SwapChainGLImpl.cpp)
-	list(APPEND INCLUDE include/GLContextWindows.h)
+    list(APPEND INCLUDE include/GLContextWindows.h)
     list(APPEND INCLUDE include/SwapChainGLImpl.h)
 elseif(PLATFORM_ANDROID)
-	list(APPEND SOURCE src/GLContextAndroid.cpp)
-	list(APPEND SOURCE src/RenderDeviceGLESImpl.cpp)
-	list(APPEND SOURCE src/GLStubsAndroid.cpp)
+    list(APPEND SOURCE src/GLContextAndroid.cpp)
+    list(APPEND SOURCE src/RenderDeviceGLESImpl.cpp)
+    list(APPEND SOURCE src/GLStubsAndroid.cpp)
     list(APPEND SOURCE src/SwapChainGLImpl.cpp)
 
-	list(APPEND INCLUDE include/GLContextAndroid.h)
-	list(APPEND INCLUDE include/GLStubsAndroid.h)
-	list(APPEND INCLUDE include/RenderDeviceGLESImpl.h)
+    list(APPEND INCLUDE include/GLContextAndroid.h)
+    list(APPEND INCLUDE include/GLStubsAndroid.h)
+    list(APPEND INCLUDE include/RenderDeviceGLESImpl.h)
     list(APPEND INCLUDE include/SwapChainGLImpl.h)
 
-	list(APPEND INTERFACE interface/RenderDeviceGLES.h)
+    list(APPEND INTERFACE interface/RenderDeviceGLES.h)
 elseif(PLATFORM_LINUX)
-	list(APPEND SOURCE src/GLContextLinux.cpp)
+    list(APPEND SOURCE src/GLContextLinux.cpp)
     list(APPEND SOURCE src/SwapChainGLImpl.cpp)
-	list(APPEND INCLUDE include/GLContextLinux.h)
+    list(APPEND INCLUDE include/GLContextLinux.h)
     list(APPEND INCLUDE include/SwapChainGLImpl.h)
 elseif(PLATFORM_MACOS)
-	list(APPEND SOURCE src/GLContextMacOS.mm)
-	list(APPEND INCLUDE include/GLContextMacOS.h)
+    list(APPEND SOURCE src/GLContextMacOS.mm)
+    list(APPEND INCLUDE include/GLContextMacOS.h)
     list(APPEND SOURCE src/SwapChainGLImpl.cpp)
     list(APPEND INCLUDE include/SwapChainGLImpl.h)
 elseif(PLATFORM_IOS)
-	list(APPEND SOURCE src/GLContextIOS.mm)
-	list(APPEND INCLUDE include/GLContextIOS.h)
+    list(APPEND SOURCE src/GLContextIOS.mm)
+    list(APPEND INCLUDE include/GLContextIOS.h)
     list(APPEND INCLUDE include/GLStubsIOS.h)
     list(APPEND SOURCE src/SwapChainGLIOS.mm)
     list(APPEND INCLUDE include/SwapChainGLIOS.h)
 else()
-	message(FATAL_ERROR "Unknown platform")
+    message(FATAL_ERROR "Unknown platform")
 endif()
 
 add_library(GraphicsEngineOpenGLInterface INTERFACE)
 target_include_directories(GraphicsEngineOpenGLInterface
 INTERFACE
-	interface
+    interface
 )
 target_link_libraries(GraphicsEngineOpenGLInterface 
 INTERFACE 
-	GraphicsEngineInterface
+    GraphicsEngineInterface
 )
 
 
 add_library(GraphicsEngineOpenGL-static STATIC 
-	${SOURCE} ${INTERFACE} ${INCLUDE}
-	readme.md
+    ${SOURCE} ${INTERFACE} ${INCLUDE}
+    readme.md
 )
 
 add_library(GraphicsEngineOpenGL-shared SHARED 
-	${SOURCE} ${INTERFACE} ${INCLUDE}
-	readme.md
+    ${SOURCE} ${INTERFACE} ${INCLUDE}
+    readme.md
 )
 if(PLATFORM_WIN32)
-	target_sources(GraphicsEngineOpenGL-shared 
-	PRIVATE	
-		src/DLLMain.cpp
-		src/GraphicsEngineOpenGL.def
-	)
+    target_sources(GraphicsEngineOpenGL-shared 
+    PRIVATE	
+        src/DLLMain.cpp
+        src/GraphicsEngineOpenGL.def
+    )
 endif()
 
 target_include_directories(GraphicsEngineOpenGL-static
 PRIVATE
-	include
-	../HLSL2GLSLConverterLib/include
+    include
+    ../HLSL2GLSLConverterLib/include
 )
 
 target_include_directories(GraphicsEngineOpenGL-shared
 PRIVATE
-	include
-	../HLSL2GLSLConverterLib/include
+    include
+    ../HLSL2GLSLConverterLib/include
 )
 
 set(PRIVATE_DEPENDENCIES 
-	BuildSettings 
-	Common 
-	TargetPlatform
-	GraphicsEngine
+    BuildSettings 
+    Common 
+    TargetPlatform
+    GraphicsEngine
 )
 
 set(PUBLIC_DEPENDENCIES 
-	GraphicsEngineOpenGLInterface
-	HLSL2GLSLConverterLib
+    GraphicsEngineOpenGLInterface
+    HLSL2GLSLConverterLib
 )
 
 if(PLATFORM_WIN32)
-	set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib)
+    set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib)
 elseif(PLATFORM_ANDROID)
-	set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android)
-	set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) # -fvisibility=hidden
+    set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android)
 elseif(PLATFORM_LINUX)
-	set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static)
+    set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static)
 elseif(PLATFORM_MACOS)
     find_package(OpenGL REQUIRED)
     set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static ${OPENGL_LIBRARY})
 elseif(PLATFORM_IOS)
     set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} ${OPENGLES})
 else()
-	message(FATAL_ERROR "Unknown platform")
+    message(FATAL_ERROR "Unknown platform")
+endif()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR 
+	CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) # -fvisibility=hidden
 endif()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -197,16 +201,16 @@ target_link_libraries(GraphicsEngineOpenGL-shared PRIVATE ${PRIVATE_DEPENDENCIES
 target_compile_definitions(GraphicsEngineOpenGL-shared PUBLIC ENGINE_DLL=1 PRIVATE BUILDING_DLL=1)
 
 if(PLATFORM_WIN32)
-	set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES
-		OUTPUT_NAME_DEBUG GraphicsEngineOpenGL${DLL_DBG_SUFFIX}
-		OUTPUT_NAME_RELEASE GraphicsEngineOpenGL${DLL_REL_SUFFIX}
-		OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineOpenGL${DLL_REL_SUFFIX}
-		OUTPUT_NAME_MINSIZEREL GraphicsEngineOpenGL${DLL_REL_SUFFIX}
-	)
+    set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES
+        OUTPUT_NAME_DEBUG GraphicsEngineOpenGL${DLL_DBG_SUFFIX}
+        OUTPUT_NAME_RELEASE GraphicsEngineOpenGL${DLL_REL_SUFFIX}
+        OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineOpenGL${DLL_REL_SUFFIX}
+        OUTPUT_NAME_MINSIZEREL GraphicsEngineOpenGL${DLL_REL_SUFFIX}
+    )
 else()
-	set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES
-		OUTPUT_NAME GraphicsEngineOpenGL
-	)
+    set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES
+        OUTPUT_NAME GraphicsEngineOpenGL
+    )
 endif()
 
 set_common_target_properties(GraphicsEngineOpenGL-shared)
@@ -214,20 +218,20 @@ set_common_target_properties(GraphicsEngineOpenGL-static)
 
 source_group("src" FILES ${SOURCE})
 if(PLATFORM_WIN32)
-	source_group("dll" FILES 
-		src/DLLMain.cpp
-		src/GraphicsEngineOpenGL.def
-	)
+    source_group("dll" FILES 
+        src/DLLMain.cpp
+        src/GraphicsEngineOpenGL.def
+    )
 endif()
 
 source_group("include" FILES ${INCLUDE})
 source_group("interface" FILES ${INTERFACE})
 
 set_target_properties(GraphicsEngineOpenGL-static PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
 
 set_source_files_properties(
diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
index 45af9cc9..ff8f4252 100644
--- a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
@@ -66,7 +66,7 @@ static GLenum GetTextureInternalFormat(DeviceContextGLImpl *pDeviceContextGL, GL
     glGetTexLevelParameteriv(QueryBindTarget, 0, GL_TEXTURE_INTERNAL_FORMAT, &GlFormat);
     CHECK_GL_ERROR( "Failed to get texture format through glGetTexLevelParameteriv()" );
     VERIFY(GlFormat != 0, "Unable to get texture format");
-    VERIFY(TexFmtFromDesc == TEX_FORMAT_UNKNOWN || GlFormat == TexFormatToGLInternalTexFormat(TexFmtFromDesc), "Texture format does not match the format specified by the texture description");
+    VERIFY(TexFmtFromDesc == TEX_FORMAT_UNKNOWN || static_cast<GLenum>(GlFormat) == TexFormatToGLInternalTexFormat(TexFmtFromDesc), "Texture format does not match the format specified by the texture description");
 #else
     if(TexFmtFromDesc != TEX_FORMAT_UNKNOWN)
         GlFormat = TexFormatToGLInternalTexFormat(TexFmtFromDesc);
diff --git a/Graphics/GraphicsTools/CMakeLists.txt b/Graphics/GraphicsTools/CMakeLists.txt
index d119fe32..3e904606 100644
--- a/Graphics/GraphicsTools/CMakeLists.txt
+++ b/Graphics/GraphicsTools/CMakeLists.txt
@@ -3,60 +3,60 @@ cmake_minimum_required (VERSION 3.6)
 project(GraphicsTools CXX)
 
 set(INCLUDE 
-	include/BasicShaderSourceStreamFactory.h
-	include/CommonlyUsedStates.h
-	include/GraphicsUtilities.h
-	include/pch.h
-	include/ShaderMacroHelper.h
-	include/TextureUploader.h
-	include/TextureUploaderBase.h
+    include/BasicShaderSourceStreamFactory.h
+    include/CommonlyUsedStates.h
+    include/GraphicsUtilities.h
+    include/pch.h
+    include/ShaderMacroHelper.h
+    include/TextureUploader.h
+    include/TextureUploaderBase.h
 )
 
 set(SOURCE 
-	src/BasicShaderSourceStreamFactory.cpp
-	src/GraphicsUtilities.cpp
-	src/pch.cpp
-	src/TextureUploader.cpp
+    src/BasicShaderSourceStreamFactory.cpp
+    src/GraphicsUtilities.cpp
+    src/pch.cpp
+    src/TextureUploader.cpp
 )
 
 set(DEPENDENCIES)
 
 if(D3D11_SUPPORTED)
-	list(APPEND SOURCE src/TextureUploaderD3D11.cpp)
-	list(APPEND INCLUDE include/TextureUploaderD3D11.h)
-	list(APPEND DEPENDENCIES GraphicsEngineD3D11Interface)
+    list(APPEND SOURCE src/TextureUploaderD3D11.cpp)
+    list(APPEND INCLUDE include/TextureUploaderD3D11.h)
+    list(APPEND DEPENDENCIES GraphicsEngineD3D11Interface)
 endif()
 
 if(D3D12_SUPPORTED)
-	list(APPEND SOURCE src/TextureUploaderD3D12.cpp)
-	list(APPEND INCLUDE include/TextureUploaderD3D12.h)
-	list(APPEND DEPENDENCIES GraphicsEngineD3D12Interface)
+    list(APPEND SOURCE src/TextureUploaderD3D12.cpp)
+    list(APPEND INCLUDE include/TextureUploaderD3D12.h)
+    list(APPEND DEPENDENCIES GraphicsEngineD3D12Interface)
 endif()
 
 if(GL_SUPPORTED OR GLES_SUPPORTED)
-	list(APPEND SOURCE src/TextureUploaderGL.cpp)
-	list(APPEND INCLUDE include/TextureUploaderGL.h)
-	list(APPEND DEPENDENCIES GraphicsEngineOpenGLInterface)
+    list(APPEND SOURCE src/TextureUploaderGL.cpp)
+    list(APPEND INCLUDE include/TextureUploaderGL.h)
+    list(APPEND DEPENDENCIES GraphicsEngineOpenGLInterface)
 endif()
 
 add_library(GraphicsTools STATIC ${SOURCE} ${INCLUDE})
 
 target_include_directories(GraphicsTools 
 PUBLIC
-	include
+    include
 PRIVATE
-	../GraphicsEngineD3DBase/include
+    ../GraphicsEngineD3DBase/include
 )
 
 target_link_libraries(GraphicsTools 
 PRIVATE 
-	Common 
-	BuildSettings
-	PlatformInterface
-	GraphicsAccessories
-	${DEPENDENCIES}
+    Common 
+    BuildSettings
+    PlatformInterface
+    GraphicsAccessories
+    ${DEPENDENCIES}
 PUBLIC
-	GraphicsEngineInterface
+    GraphicsEngineInterface
 )
 
 set_common_target_properties(GraphicsTools)
@@ -66,5 +66,5 @@ source_group("include" FILES ${INCLUDE})
 source_group("interface" FILES ${INTERFACE})
 
 set_target_properties(GraphicsTools PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )
diff --git a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
index 1f147ee1..a0855147 100644
--- a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
+++ b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
@@ -3,19 +3,19 @@ cmake_minimum_required (VERSION 3.6)
 project(HLSL2GLSLConverterLib CXX)
 
 set(INCLUDE 
-	include/GLSLDefinitions.h
-	include/HLSL2GLSLConverterImpl.h
-	include/HLSL2GLSLConverterObject.h
-	include/HLSLKeywords.h
+    include/GLSLDefinitions.h
+    include/HLSL2GLSLConverterImpl.h
+    include/HLSL2GLSLConverterObject.h
+    include/HLSLKeywords.h
 )
 
 set(INTERFACE 
-	interface/HLSL2GLSLConverter.h
+    interface/HLSL2GLSLConverter.h
 )
 
 set(SOURCE 
-	src/HLSL2GLSLConverterImpl.cpp
-	src/HLSL2GLSLConverterObject.cpp
+    src/HLSL2GLSLConverterImpl.cpp
+    src/HLSL2GLSLConverterObject.cpp
 )
 
 add_library(HLSL2GLSLConverterLib STATIC ${SOURCE} ${INTERFACE} ${INCLUDE} include/GLSLDefinitions_inc.h)
@@ -28,44 +28,44 @@ set_source_files_properties(
 
 target_include_directories(HLSL2GLSLConverterLib 
 PUBLIC 
-	interface
+    interface
 PRIVATE
-	include
+    include
 )
 
 target_link_libraries(HLSL2GLSLConverterLib 
 PRIVATE 
-	BuildSettings 
-	Common 
-	PlatformInterface 
-	GraphicsEngine
+    BuildSettings 
+    Common 
+    PlatformInterface 
+    GraphicsEngine
 PUBLIC
-	GraphicsEngineInterface
+    GraphicsEngineInterface
 )
 
 if(NOT FILE2STRING_PATH STREQUAL "")
-	# Create custom target to convert GLSLDefinitions.h to GLSLDefinitions_inc.h
-	add_custom_target(ProcessGLSLDefinitions 
-	SOURCES
-		include/GLSLDefinitions.h
-	)
+    # Create custom target to convert GLSLDefinitions.h to GLSLDefinitions_inc.h
+    add_custom_target(ProcessGLSLDefinitions 
+    SOURCES
+        include/GLSLDefinitions.h
+    )
 
-	add_custom_command(TARGET ProcessGLSLDefinitions 
-					   # Unfortunately it is not possible to set TARGET directly to HLSL2GLSLConverterLib
-					   # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators 
-					   # PRE_BUILD is treated as PRE_LINK.
-					   COMMAND ${FILE2STRING_PATH} include/GLSLDefinitions.h include/GLSLDefinitions_inc.h
-					   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-					   COMMENT "Processing GLSLDefinitions.h"
-					   VERBATIM
-	)
+    add_custom_command(TARGET ProcessGLSLDefinitions 
+                       # Unfortunately it is not possible to set TARGET directly to HLSL2GLSLConverterLib
+                       # because PRE_BUILD is only supported on Visual Studio 8 or later. For all other generators 
+                       # PRE_BUILD is treated as PRE_LINK.
+                       COMMAND ${FILE2STRING_PATH} include/GLSLDefinitions.h include/GLSLDefinitions_inc.h
+                       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                       COMMENT "Processing GLSLDefinitions.h"
+                       VERBATIM
+    )
 
-	add_dependencies(HLSL2GLSLConverterLib ProcessGLSLDefinitions)
-	set_target_properties(ProcessGLSLDefinitions PROPERTIES
-		FOLDER Core/Graphics/Helper
-	)
+    add_dependencies(HLSL2GLSLConverterLib ProcessGLSLDefinitions)
+    set_target_properties(ProcessGLSLDefinitions PROPERTIES
+        FOLDER Core/Graphics/Helper
+    )
 else()
-	message(WARNING "File2String utility is currently unavailable on this host system. This is not an issues unless you modify GLSLDefinitions.h file")
+    message(WARNING "File2String utility is currently unavailable on this host system. This is not an issues unless you modify GLSLDefinitions.h file")
 endif()
 
 source_group("src" FILES ${SOURCE})
@@ -74,5 +74,5 @@ source_group("interface" FILES ${INTERFACE})
 source_group("generated" FILES include/GLSLDefinitions_inc.h)
 
 set_target_properties(HLSL2GLSLConverterLib PROPERTIES
-	FOLDER Core/Graphics
+    FOLDER Core/Graphics
 )