Fixed formatting of cmake files + couple of minor updates

2 files changed, 130 insertions, 126 deletions

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);