From 8077ddaf62bdbff2169973eca565a5752501587d Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 19 Aug 2016 23:38:41 -0700 Subject: Updated to Diligent Engine 2.0 --- TextureLoader/build/UWP/TextureLoader.vcxproj | 200 ++++++++++++++++++++ .../build/UWP/TextureLoader.vcxproj.filters | 2 + .../build/Win32/TextureLoader-Debug.vgdbsettings | 76 ++++++++ .../build/Win32/TextureLoader-Release.vgdbsettings | 76 ++++++++ TextureLoader/build/Win32/TextureLoader.vcxproj | 203 ++++++++++++++++++++ .../build/Win32/TextureLoader.vcxproj.filters | 37 ++++ TextureLoader/build/Win32/jni/Android.mk | 37 ++++ TextureLoader/build/Win32/jni/Application.mk | 7 + .../Windows.Shared/TextureLoader.Shared.vcxitems | 41 +++++ .../TextureLoader.Shared.vcxitems.filters | 54 ++++++ .../build/Windows.Shared/TextureLoader.props | 32 ++++ TextureLoader/build/Windows/EngineRoot.props | 30 --- .../build/Windows/TextureLoader-Debug.vgdbsettings | 76 -------- .../Windows/TextureLoader-Release.vgdbsettings | 76 -------- TextureLoader/build/Windows/TextureLoader.props | 10 - TextureLoader/build/Windows/TextureLoader.vcxproj | 204 -------------------- .../build/Windows/TextureLoader.vcxproj.filters | 37 ---- TextureLoader/build/Windows/jni/Android.mk | 37 ---- TextureLoader/build/Windows/jni/Application.mk | 7 - TextureLoader/build/WindowsStore/EngineRoot.props | 30 --- .../TextureLoader.Shared.vcxitems | 36 ---- .../TextureLoader.Shared.vcxitems.filters | 51 ----- .../TextureLoader.Windows.vcxproj | 205 --------------------- .../TextureLoader.Windows.vcxproj.filters | 5 - .../TextureLoader.WindowsPhone.vcxproj | 144 --------------- .../TextureLoader.WindowsPhone.vcxproj.filters | 5 - TextureLoader/include/DDSLoader.h | 2 +- TextureLoader/include/dxgiformat.h | 2 +- TextureLoader/include/pch.h | 2 +- TextureLoader/interface/Image.h | 4 +- TextureLoader/interface/TextureLoader.h | 4 +- TextureLoader/interface/TextureUtilities.h | 2 +- TextureLoader/src/DDSLoader.cpp | 20 +- TextureLoader/src/Image.cpp | 2 +- TextureLoader/src/TextureLoader.cpp | 6 +- TextureLoader/src/TextureUtilities.cpp | 2 +- TextureLoader/src/pch.cpp | 2 +- 37 files changed, 789 insertions(+), 977 deletions(-) create mode 100644 TextureLoader/build/UWP/TextureLoader.vcxproj create mode 100644 TextureLoader/build/UWP/TextureLoader.vcxproj.filters create mode 100644 TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings create mode 100644 TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings create mode 100644 TextureLoader/build/Win32/TextureLoader.vcxproj create mode 100644 TextureLoader/build/Win32/TextureLoader.vcxproj.filters create mode 100644 TextureLoader/build/Win32/jni/Android.mk create mode 100644 TextureLoader/build/Win32/jni/Application.mk create mode 100644 TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems create mode 100644 TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems.filters create mode 100644 TextureLoader/build/Windows.Shared/TextureLoader.props delete mode 100644 TextureLoader/build/Windows/EngineRoot.props delete mode 100644 TextureLoader/build/Windows/TextureLoader-Debug.vgdbsettings delete mode 100644 TextureLoader/build/Windows/TextureLoader-Release.vgdbsettings delete mode 100644 TextureLoader/build/Windows/TextureLoader.props delete mode 100644 TextureLoader/build/Windows/TextureLoader.vcxproj delete mode 100644 TextureLoader/build/Windows/TextureLoader.vcxproj.filters delete mode 100644 TextureLoader/build/Windows/jni/Android.mk delete mode 100644 TextureLoader/build/Windows/jni/Application.mk delete mode 100644 TextureLoader/build/WindowsStore/EngineRoot.props delete mode 100644 TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems delete mode 100644 TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems.filters delete mode 100644 TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj delete mode 100644 TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj.filters delete mode 100644 TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj delete mode 100644 TextureLoader/build/WindowsStore/TextureLoader.WindowsPhone/TextureLoader.WindowsPhone.vcxproj.filters (limited to 'TextureLoader') diff --git a/TextureLoader/build/UWP/TextureLoader.vcxproj b/TextureLoader/build/UWP/TextureLoader.vcxproj new file mode 100644 index 0000000..b2c60cc --- /dev/null +++ b/TextureLoader/build/UWP/TextureLoader.vcxproj @@ -0,0 +1,200 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {90d6ce9c-e4e6-444e-bdc8-ad1d1554ecf8} + StaticLibrary + TextureLoader + en-US + 14.0 + true + Windows Store + 10.0.10586.0 + 10.0.10240.0 + 10.0 + + + + StaticLibrary + true + v140 + + + StaticLibrary + true + v140 + + + StaticLibrary + true + v140 + + + StaticLibrary + false + true + v140 + + + StaticLibrary + false + true + v140 + + + StaticLibrary + false + true + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + false + + + false + + + false + + + false + + + false + + + + false + true + + + Console + false + false + + + + + false + true + + + Console + false + false + + + + + false + true + + + Console + false + false + + + + + false + true + + + Console + false + false + + + + + false + true + + + Console + false + false + + + + + false + true + + + Console + false + false + + + + + + \ No newline at end of file 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 @@ + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader-Debug.vgdbsettings @@ -0,0 +1,76 @@ + + + Debug + + + + MinGWWindowsSlash + + $(ProjectDir) + + + android-19 + true + true + bin;obj + false + false + + + + + + false + false + true + false + false + false + false + true + false + KillApp + + false + false + false + false + false + false + false + false + + false + false + main + true + + + false + false + 5039 + 5039 + 10000 + 0 + false + Ask + true + true + + + + + + + + + + + Default + + + + true + + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings b/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader-Release.vgdbsettings @@ -0,0 +1,76 @@ + + + Release + + + + MinGWWindowsSlash + + $(ProjectDir) + + + android-19 + false + true + bin;obj + false + false + + + + + + false + false + true + false + false + false + false + true + false + KillApp + + false + false + false + false + false + false + false + false + + false + false + main + true + + + false + false + 5039 + 5039 + 10000 + 0 + false + Ask + true + true + + + + + + + + + + + Default + + + + true + + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/TextureLoader.vcxproj b/TextureLoader/build/Win32/TextureLoader.vcxproj new file mode 100644 index 0000000..8da8c4f --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader.vcxproj @@ -0,0 +1,203 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + true + true + true + true + + + true + true + true + true + + + Create + Create + Create + Create + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F} + Win32Proj + TextureLoader + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + + + Use + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/TextureLoader.vcxproj.filters b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters new file mode 100644 index 0000000..cfb971d --- /dev/null +++ b/TextureLoader/build/Win32/TextureLoader.vcxproj.filters @@ -0,0 +1,37 @@ + + + + + {9aae993e-4783-459d-acd3-791162b94c61} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + + + jni + + + jni + + + \ No newline at end of file diff --git a/TextureLoader/build/Win32/jni/Android.mk b/TextureLoader/build/Win32/jni/Android.mk new file mode 100644 index 0000000..2e99915 --- /dev/null +++ b/TextureLoader/build/Win32/jni/Android.mk @@ -0,0 +1,37 @@ +# Android NDK project makefile autogenerated by Premake + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + + +# Project configuration +LOCAL_MODULE := TextureLoader +LOCAL_CFLAGS := -std=c++11 +LOCAL_CPP_FEATURES := exceptions +LOCAL_STATIC_LIBRARIES += + +# Include paths +PROJECT_ROOT := $(LOCAL_PATH)/../../.. +REPO_ROOT := $(PROJECT_ROOT)/.. +ENGINE_ROOT := $(REPO_ROOT)/.. +CORE_ROOT := $(ENGINE_ROOT)/diligentcore +GRAPHICS_ROOT := $(CORE_ROOT)/graphics +LOCAL_C_INCLUDES += $(PROJECT_ROOT)/include +LOCAL_C_INCLUDES += $(PROJECT_ROOT)/interface +LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include +LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface +LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface +LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsEngine/interface +LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsTools/include +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/libtiff-4.0.3/libtiff +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/lpng-1.6.17 +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/libjpeg-9a +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/zlib-1.2.8 + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../src/DDSLoader.cpp ../../../src/Image.cpp ../../../src/pch.cpp ../../../src/TextureLoader.cpp ../../../src/TextureUtilities.cpp + +include $(BUILD_STATIC_LIBRARY) diff --git a/TextureLoader/build/Win32/jni/Application.mk b/TextureLoader/build/Win32/jni/Application.mk new file mode 100644 index 0000000..221d4b0 --- /dev/null +++ b/TextureLoader/build/Win32/jni/Application.mk @@ -0,0 +1,7 @@ +# Generated by VisualGDB + +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(LOCAL_PATH)/../../../../../diligentcore/Common/make/AppCommon.mk + +APP_MODULES := TextureLoader \ No newline at end of file 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 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {149d2147-99ec-471e-a8cf-d894e0d11eda} + TextureLoader + TextureLoader.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + Create + + + + + + + false + + + \ No newline at end of file diff --git a/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems.filters b/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems.filters new file mode 100644 index 0000000..5f457ec --- /dev/null +++ b/TextureLoader/build/Windows.Shared/TextureLoader.Shared.vcxitems.filters @@ -0,0 +1,54 @@ + + + + + {6588a729-c4b5-4470-b888-6be61248b64c} + + + {304ad504-120b-4e87-bfb9-b00d4f1cf0db} + + + {27789a26-7643-4bca-af3b-4d55c34cd456} + + + + + include + + + include + + + include + + + interface + + + interface + + + include + + + + + src + + + src + + + src + + + src + + + src + + + + + + \ No newline at end of file diff --git a/TextureLoader/build/Windows.Shared/TextureLoader.props b/TextureLoader/build/Windows.Shared/TextureLoader.props new file mode 100644 index 0000000..e1fd892 --- /dev/null +++ b/TextureLoader/build/Windows.Shared/TextureLoader.props @@ -0,0 +1,32 @@ + + + + + ..\.. + ..\..\..\.. + $(EngineRoot)\diligentcore + $(CoreRoot)\Graphics + $(ProjectRoot)\.. + + + $(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) + + + + + $(ProjectRoot) + + + $(EngineRoot) + + + $(CoreRoot) + + + $(GraphicsRoot) + + + $(ToolsRoot) + + + \ No newline at end of file diff --git a/TextureLoader/build/Windows/EngineRoot.props b/TextureLoader/build/Windows/EngineRoot.props deleted file mode 100644 index f6bd042..0000000 --- a/TextureLoader/build/Windows/EngineRoot.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - ..\.. - ..\..\..\.. - $(EngineRoot)\diligentcore - $(CoreRoot)\Graphics - $(ProjectRoot)\.. - - - - - - $(ProjectRoot) - - - $(EngineRoot) - - - $(CoreRoot) - - - $(GraphicsRoot) - - - $(ToolsRoot) - - - \ No newline at end of file diff --git a/TextureLoader/build/Windows/TextureLoader-Debug.vgdbsettings b/TextureLoader/build/Windows/TextureLoader-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/TextureLoader/build/Windows/TextureLoader-Debug.vgdbsettings +++ /dev/null @@ -1,76 +0,0 @@ - - - Debug - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - true - true - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - - - - - - - - - - Default - - - - true - - - \ No newline at end of file diff --git a/TextureLoader/build/Windows/TextureLoader-Release.vgdbsettings b/TextureLoader/build/Windows/TextureLoader-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/TextureLoader/build/Windows/TextureLoader-Release.vgdbsettings +++ /dev/null @@ -1,76 +0,0 @@ - - - Release - - - - MinGWWindowsSlash - - $(ProjectDir) - - - android-19 - false - true - bin;obj - false - false - - - - - - false - false - true - false - false - false - false - true - false - KillApp - - false - false - false - false - false - false - false - false - - false - false - main - true - - - false - false - 5039 - 5039 - 10000 - 0 - false - Ask - true - true - - - - - - - - - - - Default - - - - true - - - \ No newline at end of file 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 @@ - - - - - - $(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) - - - - \ No newline at end of file diff --git a/TextureLoader/build/Windows/TextureLoader.vcxproj b/TextureLoader/build/Windows/TextureLoader.vcxproj deleted file mode 100644 index 38b73f1..0000000 --- a/TextureLoader/build/Windows/TextureLoader.vcxproj +++ /dev/null @@ -1,204 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - true - true - true - true - - - true - true - true - true - - - Create - Create - Create - Create - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F} - Win32Proj - TextureLoader - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/TextureLoader/build/Windows/TextureLoader.vcxproj.filters b/TextureLoader/build/Windows/TextureLoader.vcxproj.filters deleted file mode 100644 index cfb971d..0000000 --- a/TextureLoader/build/Windows/TextureLoader.vcxproj.filters +++ /dev/null @@ -1,37 +0,0 @@ - - - - - {9aae993e-4783-459d-acd3-791162b94c61} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - - - jni - - - jni - - - \ No newline at end of file diff --git a/TextureLoader/build/Windows/jni/Android.mk b/TextureLoader/build/Windows/jni/Android.mk deleted file mode 100644 index 2e99915..0000000 --- a/TextureLoader/build/Windows/jni/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# Android NDK project makefile autogenerated by Premake - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - - -# Project configuration -LOCAL_MODULE := TextureLoader -LOCAL_CFLAGS := -std=c++11 -LOCAL_CPP_FEATURES := exceptions -LOCAL_STATIC_LIBRARIES += - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../.. -REPO_ROOT := $(PROJECT_ROOT)/.. -ENGINE_ROOT := $(REPO_ROOT)/.. -CORE_ROOT := $(ENGINE_ROOT)/diligentcore -GRAPHICS_ROOT := $(CORE_ROOT)/graphics -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/include -LOCAL_C_INCLUDES += $(PROJECT_ROOT)/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface -LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsEngine/interface -LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsTools/include -LOCAL_C_INCLUDES += $(REPO_ROOT)/External/libtiff-4.0.3/libtiff -LOCAL_C_INCLUDES += $(REPO_ROOT)/External/lpng-1.6.17 -LOCAL_C_INCLUDES += $(REPO_ROOT)/External/libjpeg-9a -LOCAL_C_INCLUDES += $(REPO_ROOT)/External/zlib-1.2.8 - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/DDSLoader.cpp ../../../src/Image.cpp ../../../src/pch.cpp ../../../src/TextureLoader.cpp ../../../src/TextureUtilities.cpp - -include $(BUILD_STATIC_LIBRARY) diff --git a/TextureLoader/build/Windows/jni/Application.mk b/TextureLoader/build/Windows/jni/Application.mk deleted file mode 100644 index 221d4b0..0000000 --- a/TextureLoader/build/Windows/jni/Application.mk +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by VisualGDB - -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(LOCAL_PATH)/../../../../../diligentcore/Common/make/AppCommon.mk - -APP_MODULES := TextureLoader \ 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 @@ - - - - - ..\..\.. - $(ProjectRoot)\.. - $(ToolsRoot)\.. - $(EngineRoot)\diligentcore - $(CoreRoot)\Graphics - - - - - - $(ProjectRoot) - - - $(ToolsRoot) - - - $(EngineRoot) - - - $(CoreRoot) - - - $(GraphicsRoot) - - - \ 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 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {149d2147-99ec-471e-a8cf-d894e0d11eda} - TextureLoader - TextureLoader.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - Create - - - - - \ No newline at end of file diff --git a/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems.filters b/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems.filters deleted file mode 100644 index a21e336..0000000 --- a/TextureLoader/build/WindowsStore/TextureLoader.Shared/TextureLoader.Shared.vcxitems.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - {6588a729-c4b5-4470-b888-6be61248b64c} - - - {304ad504-120b-4e87-bfb9-b00d4f1cf0db} - - - {27789a26-7643-4bca-af3b-4d55c34cd456} - - - - - include - - - include - - - include - - - interface - - - interface - - - include - - - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj b/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj deleted file mode 100644 index 108f536..0000000 --- a/TextureLoader/build/WindowsStore/TextureLoader.Windows/TextureLoader.Windows.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {742b0d32-3535-4382-be47-65c179cd544c} - TextureLoader - en-US - 12.0 - true - Windows Store - 8.1 - CodeSharingStaticLibrary - - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - true - v120 - - - StaticLibrary - false - true - v120 - - - StaticLibrary - false - true - v120 - - - StaticLibrary - false - true - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - false - - - false - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - - \ 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 @@ - - - - - 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 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {d12eaf5b-1fee-4740-8ec3-7240760211b9} - TextureLoader - en-US - 12.0 - true - Windows Phone - 8.1 - CodeSharingStaticLibrary - - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - true - v120_wp81 - - - StaticLibrary - false - true - v120_wp81 - - - StaticLibrary - false - true - v120_wp81 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - false - - - false - - - false - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - Use - false - true - - - Console - false - false - - - - - - \ 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 @@ - - - - - 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 + class Image : public Diligent::ObjectBase { 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(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(height); desc.Depth = static_cast(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. -- cgit v1.2.3