Updated to Diligent Engine 2.0

28 files changed, 123 insertions, 311 deletions

diff --git a/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj b/TextureLoader/build/UWP/TextureLoader.vcxproj
index 108f536..b2c60cc 100644
--- a/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj
+++ b/TextureLoader/build/UWP/TextureLoader.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
       <Configuration>Debug</Configuration>
@@ -27,88 +27,89 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{742b0d32-3535-4382-be47-65c179cd544c}</ProjectGuid>
+    <ProjectGuid>{90d6ce9c-e4e6-444e-bdc8-ad1d1554ecf8}</ProjectGuid>
+    <Keyword>StaticLibrary</Keyword>
     <RootNamespace>TextureLoader</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-    <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\TextureLoader.Shared\TextureLoader.Shared.vcxitems" Label="Shared" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\Windows.Shared\TextureLoader.Shared.vcxitems" Label="Shared" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
+    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Dbg.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
+    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_Win32Rel.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
+    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmDbg.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
+    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_ArmRel.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Dbg.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
+    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Dbg.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore64Rel.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
+    <Import Project="..\..\..\..\diligentcore\Shared\build\UWP\UWP_X64Rel.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
@@ -129,7 +130,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
@@ -141,7 +141,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
@@ -153,7 +152,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
@@ -165,7 +163,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
@@ -177,7 +174,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
@@ -189,7 +185,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <CompileAsWinRT>false</CompileAsWinRT>
       <SDLCheck>true</SDLCheck>
     </ClCompile>
diff --git a/TextureLoader/build/UWP/TextureLoader.vcxproj.filters b/TextureLoader/build/UWP/TextureLoader.vcxproj.filters
new file mode 100644
index 0000000..c31757e
--- /dev/null
+++ b/TextureLoader/build/UWP/TextureLoader.vcxproj.filters
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
\ No newline at end of file
diff --git a/TextureLoader/build/Windows/TextureLoader-Debug.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings
index 3f5b24b..3f5b24b 100644
--- a/TextureLoader/build/Windows/TextureLoader-Debug.vgdbsettings
+++ b/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings
diff --git a/TextureLoader/build/Windows/TextureLoader-Release.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings
index 669691f..669691f 100644
--- a/TextureLoader/build/Windows/TextureLoader-Release.vgdbsettings
+++ b/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings
diff --git a/TextureLoader/build/Windows/TextureLoader.vcxproj b/TextureLoader/build/Win32/TextureLoader.vcxproj
index 38b73f1..8da8c4f 100644
--- a/TextureLoader/build/Windows/TextureLoader.vcxproj
+++ b/TextureLoader/build/Win32/TextureLoader.vcxproj
@@ -108,31 +108,30 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
-    <Import Project="..\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems')" />
+    <Import Project="..\Windows.Shared\TextureLoader.Shared.vcxitems" Label="Shared" Condition="Exists('..\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems')" />
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+    <Import Project="..\Windows.Shared\TextureLoader.Shared.vcxitems" Label="Shared" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win32d.props" />
-    <Import Project="EngineRoot.props" />
-    <Import Project="TextureLoader.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64d.props" />
-    <Import Project="EngineRoot.props" />
-    <Import Project="TextureLoader.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win32r.props" />
-    <Import Project="EngineRoot.props" />
-    <Import Project="TextureLoader.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Win64r.props" />
-    <Import Project="EngineRoot.props" />
-    <Import Project="TextureLoader.props" />
+    <Import Project="..\Windows.Shared\TextureLoader.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <Import Project="..\..\..\..\diligentcore\Shared\build\Windows\Android32d.props" />
diff --git a/TextureLoader/build/Windows/TextureLoader.vcxproj.filters b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters
index cfb971d..cfb971d 100644
--- a/TextureLoader/build/Windows/TextureLoader.vcxproj.filters
+++ b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters
diff --git a/TextureLoader/build/Windows/jni/Android.mk b/TextureLoader/build/Win32/jni/Android.mk
index 2e99915..2e99915 100644
--- a/TextureLoader/build/Windows/jni/Android.mk
+++ b/TextureLoader/build/Win32/jni/Android.mk
diff --git a/TextureLoader/build/Windows/jni/Application.mk b/TextureLoader/build/Win32/jni/Application.mk
index 221d4b0..221d4b0 100644
--- a/TextureLoader/build/Windows/jni/Application.mk
+++ b/TextureLoader/build/Win32/jni/Application.mk
diff --git a/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems b/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems
new file mode 100644
index 0000000..014318d
--- /dev/null
+++ b/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <ItemsProjectGuid>{149d2147-99ec-471e-a8cf-d894e0d11eda}</ItemsProjectGuid>
+    <ItemsRootNamespace>TextureLoader</ItemsRootNamespace>
+    <ItemsProjectName>TextureLoader.Shared</ItemsProjectName>
+    <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectCapability Include="SourceItemsFromImports" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DDSLoader.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\dxgiformat.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pch.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\TextureUtilities.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\interface\Image.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\interface\TextureLoader.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DDSLoader.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\Image.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\TextureLoader.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\TextureUtilities.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems.filters b/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems.filters
index a21e336..5f457ec 100644
--- a/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems.filters
+++ b/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems.filters
@@ -12,40 +12,43 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\DDSLoader.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\DDSLoader.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\dxgiformat.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\dxgiformat.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\pch.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\pch.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\interface\Image.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\interface\Image.h">
       <Filter>interface</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\interface\TextureLoader.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\interface\TextureLoader.h">
       <Filter>interface</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\TextureUtilities.h">
+    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\include\TextureUtilities.h">
       <Filter>include</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\DDSLoader.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\DDSLoader.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\Image.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\Image.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\pch.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\pch.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\TextureLoader.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\TextureLoader.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\TextureUtilities.cpp">
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\TextureUtilities.cpp">
       <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)..\..\CMakeLists.txt" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/TextureLoader/build/Windows/EngineRoot.props b/TextureLoader/build/Windows.Shared/TextureLoader.props
index f6bd042..e1fd892 100644
--- a/TextureLoader/build/Windows/EngineRoot.props
+++ b/TextureLoader/build/Windows.Shared/TextureLoader.props
@@ -8,7 +8,9 @@
     <GraphicsRoot>$(CoreRoot)\Graphics</GraphicsRoot>
     <ToolsRoot>$(ProjectRoot)\..</ToolsRoot>
   </PropertyGroup>
-  <PropertyGroup />
+  <PropertyGroup>
+    <IncludePath>$(ProjectRoot)\include;$(ProjectRoot)\interface;$(CoreRoot)\Common\interface;$(CoreRoot)\Common\include;$(CoreRoot)\Platforms\interface;$(GraphicsRoot)\GraphicsEngine\interface;$(GraphicsRoot)\GraphicsTools\include;$(ToolsRoot)\External\libtiff-4.0.3\libtiff;$(ToolsRoot)\External\lpng-1.6.17;$(ToolsRoot)\External\zlib-1.2.8;$(ToolsRoot)\External\libjpeg-9a;$(IncludePath)</IncludePath>
+  </PropertyGroup>
   <ItemDefinitionGroup />
   <ItemGroup>
     <BuildMacro Include="ProjectRoot">
diff --git a/TextureLoader/build/Windows/TextureLoader.props b/TextureLoader/build/Windows/TextureLoader.props
deleted file mode 100644
index a202be5..0000000
--- a/TextureLoader/build/Windows/TextureLoader.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IncludePath>$(ProjectRoot)\include;$(ProjectRoot)\interface;$(CoreRoot)\Common\interface;$(CoreRoot)\Common\include;$(CoreRoot)\Platforms\interface;$(GraphicsRoot)\GraphicsEngine\interface;$(GraphicsRoot)\GraphicsTools\include;$(ToolsRoot)\External\libtiff-4.0.3\libtiff;$(ToolsRoot)\External\lpng-1.6.17;$(ToolsRoot)\External\zlib-1.2.8;$(ToolsRoot)\External\libjpeg-9a;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/TextureLoader/build/WindowsStore/EngineRoot.props b/TextureLoader/build/WindowsStore/EngineRoot.props
deleted file mode 100644
index 79dc389..0000000
--- a/TextureLoader/build/WindowsStore/EngineRoot.props
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
-    <ProjectRoot>..\..\..</ProjectRoot>
-    <ToolsRoot>$(ProjectRoot)\..</ToolsRoot>
-    <EngineRoot>$(ToolsRoot)\..</EngineRoot>
-    <CoreRoot>$(EngineRoot)\diligentcore</CoreRoot>
-    <GraphicsRoot>$(CoreRoot)\Graphics</GraphicsRoot>
-  </PropertyGroup>
-  <PropertyGroup />
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="ProjectRoot">
-      <Value>$(ProjectRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ToolsRoot">
-      <Value>$(ToolsRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="EngineRoot">
-      <Value>$(EngineRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CoreRoot">
-      <Value>$(CoreRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GraphicsRoot">
-      <Value>$(GraphicsRoot)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems b/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems
deleted file mode 100644
index bd4f2e5..0000000
--- a/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <ItemsProjectGuid>{149d2147-99ec-471e-a8cf-d894e0d11eda}</ItemsProjectGuid>
-    <ItemsRootNamespace>TextureLoader</ItemsRootNamespace>
-    <ItemsProjectName>TextureLoader.Shared</ItemsProjectName>
-    <CodeSharingProject>248F659F-DAC5-46E8-AC09-60EC9FC95053</CodeSharingProject>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectCapability Include="SourceItemsFromImports" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\DDSLoader.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\dxgiformat.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\pch.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\include\TextureUtilities.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\interface\Image.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\interface\TextureLoader.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\DDSLoader.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\Image.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\TextureLoader.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\TextureUtilities.cpp" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj.filters b/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj.filters
deleted file mode 100644
index a7761ab..0000000
--- a/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj.filters
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<ItemGroup>
-	</ItemGroup>
-</Project>
diff --git a/TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj b/TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj
deleted file mode 100644
index 5f8ec42..0000000
--- a/TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{d12eaf5b-1fee-4740-8ec3-7240760211b9}</ProjectGuid>
-    <RootNamespace>TextureLoader</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Phone</ApplicationType>
-    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
-    <ConvergedProjectType>CodeSharingStaticLibrary</ConvergedProjectType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_wp81</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\TextureLoader.Shared\TextureLoader.Shared.vcxitems" Label="Shared" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Dbg.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStore32Rel.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmDbg.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\..\diligentcore\Shared\build\WindowsStore\WinStoreArmRel.props" />
-    <Import Project="..\EngineRoot.props" />
-    <Import Project="..\..\Windows\TextureLoader.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj.filters b/TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj.filters
deleted file mode 100644
index a7761ab..0000000
--- a/TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj.filters
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<ItemGroup>
-	</ItemGroup>
-</Project>
diff --git a/TextureLoader/include/DDSLoader.h b/TextureLoader/include/DDSLoader.h
index 93cebe9..ed3bc5a 100644
--- a/TextureLoader/include/DDSLoader.h
+++ b/TextureLoader/include/DDSLoader.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/TextureLoader/include/dxgiformat.h b/TextureLoader/include/dxgiformat.h
index 12f5539..3b68567 100644
--- a/TextureLoader/include/dxgiformat.h
+++ b/TextureLoader/include/dxgiformat.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/TextureLoader/include/pch.h b/TextureLoader/include/pch.h
index 25b03a3..2e4f192 100644
--- a/TextureLoader/include/pch.h
+++ b/TextureLoader/include/pch.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h
index 74917e6..ae41a0e 100644
--- a/TextureLoader/interface/Image.h
+++ b/TextureLoader/interface/Image.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ namespace Diligent
         {}
     };
 
-    class Image : public Diligent::ObjectBase<Diligent::IObject>
+    class Image : public Diligent::ObjectBase<Diligent::IObject, Diligent::IMemoryAllocator>
     {
     public:
         Image( Diligent::IFileStream *pSrcFile, 
diff --git a/TextureLoader/interface/TextureLoader.h b/TextureLoader/interface/TextureLoader.h
index d46582e..3b9769c 100644
--- a/TextureLoader/interface/TextureLoader.h
+++ b/TextureLoader/interface/TextureLoader.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ namespace Diligent
             BindFlags( Diligent::BIND_SHADER_RESOURCE ),
             MipLevels(0),
             CPUAccessFlags(0),
-            IsSRGB(true),
+            IsSRGB(false),
             Format(Diligent::TEX_FORMAT_UNKNOWN)
         {}
     };
diff --git a/TextureLoader/interface/TextureUtilities.h b/TextureLoader/interface/TextureUtilities.h
index e68ac40..69c125a 100644
--- a/TextureLoader/interface/TextureUtilities.h
+++ b/TextureLoader/interface/TextureUtilities.h
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/TextureLoader/src/DDSLoader.cpp b/TextureLoader/src/DDSLoader.cpp
index 2c701f3..5fef9fe 100644
--- a/TextureLoader/src/DDSLoader.cpp
+++ b/TextureLoader/src/DDSLoader.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -968,7 +968,7 @@ static void CreateTexture(
     {
         case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
             {
-                desc.Type = arraySize > 1 ? TEXTURE_TYPE_1D_ARRAY : TEXTURE_TYPE_1D;
+                desc.Type = arraySize > 1 ? RESOURCE_DIM_TEX_1D_ARRAY : RESOURCE_DIM_TEX_1D;
                 pDevice->CreateTexture( desc, InitData, texture );
                 
             //    ID3D11Texture1D* tex = nullptr;
@@ -1015,14 +1015,11 @@ static void CreateTexture(
             }
             break;
 
-        case TEXTURE_TYPE_2D:
-        case TEXTURE_TYPE_2D_ARRAY:
-        case TEXTURE_TYPE_CUBE:
-        case TEXTURE_TYPE_CUBE_ARRAY:
+        case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
             {
                 desc.Type = isCubeMap ?
-                    (arraySize > 1 ? TEXTURE_TYPE_CUBE_ARRAY : TEXTURE_TYPE_CUBE) : 
-                    (arraySize > 1 ? TEXTURE_TYPE_2D_ARRAY : TEXTURE_TYPE_2D);
+                    (arraySize/6 > 1 ? RESOURCE_DIM_TEX_CUBE_ARRAY : RESOURCE_DIM_TEX_CUBE) : 
+                    (arraySize > 1 ? RESOURCE_DIM_TEX_2D_ARRAY : RESOURCE_DIM_TEX_2D);
                 desc.Height = static_cast<Uint32>(height);
 
                 //if (isCubeMap)
@@ -1096,9 +1093,9 @@ static void CreateTexture(
             }
             break;
 
-        case TEXTURE_TYPE_3D:
+        case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
             {
-                desc.Type = TEXTURE_TYPE_3D;
+                desc.Type = RESOURCE_DIM_TEX_3D;
                 desc.Height = static_cast<Uint32>(height);
                 desc.Depth = static_cast<Uint32>(depth);
 
@@ -1139,6 +1136,9 @@ static void CreateTexture(
                 //}
             }
             break;
+
+        default:
+            LOG_ERROR_AND_THROW("Invalid resource dimension (", resDim, ")");
     }
 }
 
diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
index d78f2da..71bca36 100644
--- a/TextureLoader/src/Image.cpp
+++ b/TextureLoader/src/Image.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp
index 63134a4..182363d 100644
--- a/TextureLoader/src/TextureLoader.cpp
+++ b/TextureLoader/src/TextureLoader.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ namespace Diligent
     {
         const auto& ImgDesc = pSrcImage->GetDesc();
         TextureDesc TexDesc;
-        TexDesc.Type = TEXTURE_TYPE_2D;
+        TexDesc.Type = RESOURCE_DIM_TEX_2D;
         TexDesc.Width = ImgDesc.Width;
         TexDesc.Height = ImgDesc.Height;
         TexDesc.MipLevels = ComputeMipLevelsCount( TexDesc.Width, TexDesc.Height );
@@ -242,7 +242,7 @@ namespace Diligent
                                      TexLoadInfo.BindFlags,
                                      TexLoadInfo.CPUAccessFlags,
                                      0, // miscFlags
-                                     false, // forceSRGB
+                                     TexLoadInfo.IsSRGB, // forceSRGB
                                      ppTexture );
     }
 }
diff --git a/TextureLoader/src/TextureUtilities.cpp b/TextureLoader/src/TextureUtilities.cpp
index 2ee94ba..4d166a6 100644
--- a/TextureLoader/src/TextureUtilities.cpp
+++ b/TextureLoader/src/TextureUtilities.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/TextureLoader/src/pch.cpp b/TextureLoader/src/pch.cpp
index 4a893f2..964b3f1 100644
--- a/TextureLoader/src/pch.cpp
+++ b/TextureLoader/src/pch.cpp
@@ -1,4 +1,4 @@
-/*     Copyright 2015 Egor Yusov
+/*     Copyright 2015-2016 Egor Yusov
  *  
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.