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 --- ConfiurationNotes.txt | 3 - External/libjpeg-9a/build/UWP/libjpeg.vcxproj | 206 ++++++++ .../libjpeg-9a/build/UWP/libjpeg.vcxproj.filters | 2 + External/libjpeg-9a/build/Win32/jni/Android.mk | 22 + External/libjpeg-9a/build/Win32/jni/Application.mk | 7 + .../build/Win32/libjpeg-Debug.vgdbsettings | 76 +++ .../build/Win32/libjpeg-Release.vgdbsettings | 76 +++ External/libjpeg-9a/build/Win32/libjpeg.vcxproj | 432 +++++++++++++++++ .../libjpeg-9a/build/Win32/libjpeg.vcxproj.filters | 159 +++++++ .../build/Windows.Shared/libjpeg.Shared.vcxitems | 83 ++++ .../Windows.Shared/libjpeg.Shared.vcxitems.filters | 183 ++++++++ .../libjpeg-9a/build/Windows.Shared/libjpeg.props | 14 + External/libjpeg-9a/build/Windows/jni/Android.mk | 22 - .../libjpeg-9a/build/Windows/jni/Application.mk | 7 - .../build/Windows/libjpeg-Debug.vgdbsettings | 76 --- .../build/Windows/libjpeg-Release.vgdbsettings | 76 --- External/libjpeg-9a/build/Windows/libjpeg.props | 13 - External/libjpeg-9a/build/Windows/libjpeg.vcxproj | 432 ----------------- .../build/Windows/libjpeg.vcxproj.filters | 159 ------- .../libjpeg.Shared/libjpeg.Shared.vcxitems | 78 ---- .../libjpeg.Shared/libjpeg.Shared.vcxitems.filters | 180 ------- .../libjpeg.Windows/libjpeg.Windows.vcxproj | 199 -------- .../libjpeg.Windows.vcxproj.filters | 5 - .../libjpeg.WindowsPhone.vcxproj | 140 ------ .../libjpeg.WindowsPhone.vcxproj.filters | 5 - External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj | 215 +++++++++ .../build/UWP/LibTiff.vcxproj.filters | 6 + .../build/Win32/LibTiff-Debug.vgdbsettings | 76 +++ .../build/Win32/LibTiff-Release.vgdbsettings | 76 +++ External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj | 383 +++++++++++++++ .../build/Win32/LibTiff.vcxproj.filters | 153 ++++++ External/libtiff-4.0.3/build/Win32/jni/Android.mk | 27 ++ .../libtiff-4.0.3/build/Win32/jni/Application.mk | 7 + .../build/Windows.Shared/LibTiff.Shared.vcxitems | 91 ++++ .../Windows.Shared/LibTiff.Shared.vcxitems.filters | 197 ++++++++ .../build/Windows.Shared/LibTiff.props | 14 + .../build/Windows/LibTiff-Debug.vgdbsettings | 76 --- .../build/Windows/LibTiff-Release.vgdbsettings | 76 --- External/libtiff-4.0.3/build/Windows/LibTiff.props | 13 - .../libtiff-4.0.3/build/Windows/LibTiff.vcxproj | 385 --------------- .../build/Windows/LibTiff.vcxproj.filters | 153 ------ .../libtiff-4.0.3/build/Windows/jni/Android.mk | 27 -- .../libtiff-4.0.3/build/Windows/jni/Application.mk | 7 - .../LibTiff.Shared/LibTiff.Shared.vcxitems | 86 ---- .../LibTiff.Shared/LibTiff.Shared.vcxitems.filters | 194 -------- .../LibTiff.Windows/LibTiff.Windows.vcxproj | 208 --------- .../LibTiff.Windows.vcxproj.filters | 13 - .../LibTiff.WindowsPhone.vcxproj | 147 ------ .../LibTiff.WindowsPhone.vcxproj.filters | 13 - External/libtiff-4.0.3/libtiff/tif_config.h | 2 +- External/libtiff-4.0.3/libtiff/tiffconf.h | 2 +- External/lpng-1.6.17/CMakeLists.txt | 374 --------------- External/lpng-1.6.17/CMakeLists.~txt | 374 +++++++++++++++ External/lpng-1.6.17/build/UWP/LibPng.vcxproj | 212 +++++++++ .../lpng-1.6.17/build/UWP/LibPng.vcxproj.filters | 2 + .../build/Win32/LibPng-Debug.vgdbsettings | 76 +++ .../build/Win32/LibPng-Release.vgdbsettings | 76 +++ External/lpng-1.6.17/build/Win32/LibPng.vcxproj | 271 +++++++++++ .../lpng-1.6.17/build/Win32/LibPng.vcxproj.filters | 66 +++ External/lpng-1.6.17/build/Win32/jni/Android.mk | 22 + .../lpng-1.6.17/build/Win32/jni/Application.mk | 7 + .../build/Windows.Shared/LibPng.Shared.vcxitems | 49 ++ .../Windows.Shared/LibPng.Shared.vcxitems.filters | 81 ++++ .../lpng-1.6.17/build/Windows.Shared/LibPng.props | 13 + .../build/Windows/LibPng-Debug.vgdbsettings | 76 --- .../build/Windows/LibPng-Release.vgdbsettings | 76 --- External/lpng-1.6.17/build/Windows/LibPng.props | 13 - External/lpng-1.6.17/build/Windows/LibPng.vcxproj | 271 ----------- .../build/Windows/LibPng.vcxproj.filters | 66 --- External/lpng-1.6.17/build/Windows/jni/Android.mk | 22 - .../lpng-1.6.17/build/Windows/jni/Application.mk | 7 - .../LibPng.Shared/LibPng.Shared.vcxitems | 44 -- .../LibPng.Shared/LibPng.Shared.vcxitems.filters | 78 ---- .../LibPng.Windows/LibPng.Windows.vcxproj | 205 -------- .../LibPng.Windows/LibPng.Windows.vcxproj.filters | 5 - .../LibPng.WindowsPhone.vcxproj | 144 ------ .../LibPng.WindowsPhone.vcxproj.filters | 5 - External/lua-5.2.3/build/UWP/Lua.vcxproj | 214 +++++++++ External/lua-5.2.3/build/UWP/Lua.vcxproj.filters | 2 + .../lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings | 76 +++ .../lua-5.2.3/build/Win32/Lua-Release.vgdbsettings | 76 +++ External/lua-5.2.3/build/Win32/Lua.vcxproj | 372 +++++++++++++++ External/lua-5.2.3/build/Win32/Lua.vcxproj.filters | 117 +++++ External/lua-5.2.3/build/Win32/jni/Android.mk | 21 + External/lua-5.2.3/build/Win32/jni/Application.mk | 7 + .../build/Windows.Shared/Lua.Shared.vcxitems | 85 ++++ .../Windows.Shared/Lua.Shared.vcxitems.filters | 189 ++++++++ .../lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings | 76 --- .../build/Windows/Lua-Release.vgdbsettings | 76 --- External/lua-5.2.3/build/Windows/Lua.vcxproj | 370 --------------- .../lua-5.2.3/build/Windows/Lua.vcxproj.filters | 117 ----- External/lua-5.2.3/build/Windows/jni/Android.mk | 21 - .../lua-5.2.3/build/Windows/jni/Application.mk | 7 - .../WindowsStore/Lua.Shared/Lua.Shared.vcxitems | 80 ---- .../Lua.Shared/Lua.Shared.vcxitems.filters | 186 -------- .../WindowsStore/Lua.Windows/Lua.Windows.vcxproj | 205 -------- .../Lua.Windows/Lua.Windows.vcxproj.filters | 5 - .../Lua.WindowsPhone/Lua.WindowsPhone.vcxproj | 144 ------ .../Lua.WindowsPhone.vcxproj.filters | 5 - External/lua-5.2.3/src/luaconf.h | 2 +- External/zlib-1.2.8/CMakeLists.txt | 249 ---------- External/zlib-1.2.8/CMakeLists.~txt | 254 ++++++++++ External/zlib-1.2.8/build/UWP/zlib.vcxproj | 200 ++++++++ External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters | 2 + External/zlib-1.2.8/build/Win32/jni/Android.mk | 22 + External/zlib-1.2.8/build/Win32/jni/Application.mk | 7 + .../zlib-1.2.8/build/Win32/zlib-Debug.vgdbsettings | 76 +++ .../build/Win32/zlib-Release.vgdbsettings | 76 +++ External/zlib-1.2.8/build/Win32/zlib.vcxproj | 264 +++++++++++ .../zlib-1.2.8/build/Win32/zlib.vcxproj.filters | 67 +++ .../build/Windows.Shared/zlib.Shared.vcxitems | 54 +++ .../Windows.Shared/zlib.Shared.vcxitems.filters | 96 ++++ .../zlib-1.2.8/build/Windows.Shared/zlib.props | 13 + External/zlib-1.2.8/build/Windows/jni/Android.mk | 22 - .../zlib-1.2.8/build/Windows/jni/Application.mk | 7 - .../build/Windows/zlib-Debug.vgdbsettings | 76 --- .../build/Windows/zlib-Release.vgdbsettings | 76 --- External/zlib-1.2.8/build/Windows/zlib.props | 13 - External/zlib-1.2.8/build/Windows/zlib.vcxproj | 264 ----------- .../zlib-1.2.8/build/Windows/zlib.vcxproj.filters | 67 --- .../WindowsStore/zlib.Shared/zlib.Shared.vcxitems | 49 -- .../zlib.Shared/zlib.Shared.vcxitems.filters | 93 ---- .../WindowsStore/zlib.Windows/zlib.Windows.vcxproj | 193 -------- .../zlib.Windows/zlib.Windows.vcxproj.filters | 5 - .../zlib.WindowsPhone/zlib.WindowsPhone.vcxproj | 136 ------ .../zlib.WindowsPhone.vcxproj.filters | 5 - RenderScript/build/UWP/RenderScript.vcxproj | 200 ++++++++ .../build/UWP/RenderScript.vcxproj.filters | 2 + .../build/Win32/RenderScript-Debug.vgdbsettings | 76 +++ .../build/Win32/RenderScript-Release.vgdbsettings | 76 +++ RenderScript/build/Win32/RenderScript.vcxproj | 316 +++++++++++++ .../build/Win32/RenderScript.vcxproj.filters | 96 ++++ RenderScript/build/Win32/jni/Android.mk | 31 ++ RenderScript/build/Win32/jni/Application.mk | 7 + .../Windows.Shared/RenderScript.Shared.vcxitems | 86 ++++ .../RenderScript.Shared.vcxitems.filters | 186 ++++++++ .../build/Windows.Shared/RenderScript.props | 32 ++ RenderScript/build/Windows/EngineRoot.props | 30 -- .../build/Windows/RenderScript-Debug.vgdbsettings | 76 --- .../Windows/RenderScript-Release.vgdbsettings | 76 --- RenderScript/build/Windows/RenderScript.props | 10 - RenderScript/build/Windows/RenderScript.vcxproj | 308 ------------ .../build/Windows/RenderScript.vcxproj.filters | 90 ---- RenderScript/build/Windows/jni/Android.mk | 31 -- RenderScript/build/Windows/jni/Application.mk | 7 - RenderScript/build/WindowsStore/EngineRoot.props | 30 -- .../RenderScript.Shared.vcxitems | 77 --- .../RenderScript.Shared.vcxitems.filters | 171 ------- .../RenderScript.Windows.vcxproj | 205 -------- .../RenderScript.Windows.vcxproj.filters | 5 - .../RenderScript.WindowsPhone.vcxproj | 144 ------ .../RenderScript.WindowsPhone.vcxproj.filters | 5 - RenderScript/include/BlendStateDescParser.h | 41 ++ RenderScript/include/BlendStateParser.h | 51 -- RenderScript/include/BufferParser.h | 2 +- RenderScript/include/BufferViewParser.h | 2 +- RenderScript/include/ClassMethodBinding.h | 2 +- RenderScript/include/ConvenienceFunctions.h | 10 +- RenderScript/include/Debug.h | 2 +- RenderScript/include/DepthStencilStateDescParser.h | 43 ++ RenderScript/include/DepthStencilStateParser.h | 52 --- RenderScript/include/DeviceContextFuncBindings.h | 25 +- RenderScript/include/DrawAttribsParser.h | 2 +- RenderScript/include/EngineObjectParserBase.h | 2 +- RenderScript/include/EngineObjectParserCommon.h | 2 +- RenderScript/include/EnumMappings.h | 15 +- RenderScript/include/InputLayoutDescParser.h | 51 ++ RenderScript/include/LayoutDescParser.h | 55 --- RenderScript/include/LuaBindings.h | 63 ++- RenderScript/include/LuaFunctionBinding.h | 2 +- RenderScript/include/LuaWrappers.h | 2 +- RenderScript/include/PSODescParser.h | 56 +++ RenderScript/include/ParsingErrors.h | 2 +- RenderScript/include/RasterizerStateDescParser.h | 50 ++ RenderScript/include/RasterizerStateParser.h | 60 --- RenderScript/include/ResourceMappingParser.h | 5 +- RenderScript/include/SamplerParser.h | 53 ++- RenderScript/include/ScissorRectParser.h | 2 +- RenderScript/include/ScriptParser.h | 25 +- RenderScript/include/ShaderParser.h | 10 +- RenderScript/include/ShaderResourceBindingParser.h | 69 +++ RenderScript/include/ShaderVariableParser.h | 2 +- RenderScript/include/TextureParser.h | 4 +- RenderScript/include/TextureViewParser.h | 4 +- RenderScript/include/ViewportParser.h | 2 +- RenderScript/include/pch.h | 2 +- RenderScript/src/BlendStateDescParser.cpp | 154 ++++++ RenderScript/src/BlendStateParser.cpp | 196 -------- RenderScript/src/BufferParser.cpp | 2 +- RenderScript/src/BufferViewParser.cpp | 2 +- RenderScript/src/DepthStencilStateDescParser.cpp | 103 ++++ RenderScript/src/DepthStencilStateParser.cpp | 127 ----- RenderScript/src/DeviceContextFuncBindings.cpp | 115 ++++- RenderScript/src/DrawAttribsParser.cpp | 2 +- RenderScript/src/EngineObjectParserBase.cpp | 2 +- RenderScript/src/EnumMappings.cpp | 45 +- RenderScript/src/InputLayoutDescParser.cpp | 87 ++++ RenderScript/src/LayoutDescParser.cpp | 151 ------ RenderScript/src/LuaBindings.cpp | 2 +- RenderScript/src/LuaFunctionBinding.cpp | 2 +- RenderScript/src/LuaWrappers.cpp | 2 +- RenderScript/src/PSODescParser.cpp | 257 ++++++++++ RenderScript/src/ParsingErrors.cpp | 2 +- RenderScript/src/RasterizerStateDescParser.cpp | 70 +++ RenderScript/src/RasterizerStateParser.cpp | 89 ---- RenderScript/src/ResourceMappingParser.cpp | 22 +- RenderScript/src/SamplerParser.cpp | 40 +- RenderScript/src/ScissorRectParser.cpp | 2 +- RenderScript/src/ScriptParser.cpp | 49 +- RenderScript/src/ShaderParser.cpp | 308 ++++++++++-- RenderScript/src/ShaderResourceBindingParser.cpp | 192 ++++++++ RenderScript/src/ShaderVariableParser.cpp | 2 +- RenderScript/src/TextureParser.cpp | 63 ++- RenderScript/src/TextureViewParser.cpp | 4 +- RenderScript/src/ViewportParser.cpp | 2 +- RenderScript/src/pch.cpp | 2 +- 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 +- build/Windows/Tools.sln | 515 -------------------- build/WindowsStore/Tools.sln | 516 --------------------- 255 files changed, 9793 insertions(+), 11019 deletions(-) delete mode 100644 ConfiurationNotes.txt create mode 100644 External/libjpeg-9a/build/UWP/libjpeg.vcxproj create mode 100644 External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters create mode 100644 External/libjpeg-9a/build/Win32/jni/Android.mk create mode 100644 External/libjpeg-9a/build/Win32/jni/Application.mk create mode 100644 External/libjpeg-9a/build/Win32/libjpeg-Debug.vgdbsettings create mode 100644 External/libjpeg-9a/build/Win32/libjpeg-Release.vgdbsettings create mode 100644 External/libjpeg-9a/build/Win32/libjpeg.vcxproj create mode 100644 External/libjpeg-9a/build/Win32/libjpeg.vcxproj.filters create mode 100644 External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems create mode 100644 External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters create mode 100644 External/libjpeg-9a/build/Windows.Shared/libjpeg.props delete mode 100644 External/libjpeg-9a/build/Windows/jni/Android.mk delete mode 100644 External/libjpeg-9a/build/Windows/jni/Application.mk delete mode 100644 External/libjpeg-9a/build/Windows/libjpeg-Debug.vgdbsettings delete mode 100644 External/libjpeg-9a/build/Windows/libjpeg-Release.vgdbsettings delete mode 100644 External/libjpeg-9a/build/Windows/libjpeg.props delete mode 100644 External/libjpeg-9a/build/Windows/libjpeg.vcxproj delete mode 100644 External/libjpeg-9a/build/Windows/libjpeg.vcxproj.filters delete mode 100644 External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems delete mode 100644 External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters delete mode 100644 External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj delete mode 100644 External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters delete mode 100644 External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj delete mode 100644 External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters create mode 100644 External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj create mode 100644 External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters create mode 100644 External/libtiff-4.0.3/build/Win32/LibTiff-Debug.vgdbsettings create mode 100644 External/libtiff-4.0.3/build/Win32/LibTiff-Release.vgdbsettings create mode 100644 External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj create mode 100644 External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj.filters create mode 100644 External/libtiff-4.0.3/build/Win32/jni/Android.mk create mode 100644 External/libtiff-4.0.3/build/Win32/jni/Application.mk create mode 100644 External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems create mode 100644 External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters create mode 100644 External/libtiff-4.0.3/build/Windows.Shared/LibTiff.props delete mode 100644 External/libtiff-4.0.3/build/Windows/LibTiff-Debug.vgdbsettings delete mode 100644 External/libtiff-4.0.3/build/Windows/LibTiff-Release.vgdbsettings delete mode 100644 External/libtiff-4.0.3/build/Windows/LibTiff.props delete mode 100644 External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj delete mode 100644 External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj.filters delete mode 100644 External/libtiff-4.0.3/build/Windows/jni/Android.mk delete mode 100644 External/libtiff-4.0.3/build/Windows/jni/Application.mk delete mode 100644 External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems delete mode 100644 External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters delete mode 100644 External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj delete mode 100644 External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters delete mode 100644 External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj delete mode 100644 External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters delete mode 100644 External/lpng-1.6.17/CMakeLists.txt create mode 100644 External/lpng-1.6.17/CMakeLists.~txt create mode 100644 External/lpng-1.6.17/build/UWP/LibPng.vcxproj create mode 100644 External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters create mode 100644 External/lpng-1.6.17/build/Win32/LibPng-Debug.vgdbsettings create mode 100644 External/lpng-1.6.17/build/Win32/LibPng-Release.vgdbsettings create mode 100644 External/lpng-1.6.17/build/Win32/LibPng.vcxproj create mode 100644 External/lpng-1.6.17/build/Win32/LibPng.vcxproj.filters create mode 100644 External/lpng-1.6.17/build/Win32/jni/Android.mk create mode 100644 External/lpng-1.6.17/build/Win32/jni/Application.mk create mode 100644 External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems create mode 100644 External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters create mode 100644 External/lpng-1.6.17/build/Windows.Shared/LibPng.props delete mode 100644 External/lpng-1.6.17/build/Windows/LibPng-Debug.vgdbsettings delete mode 100644 External/lpng-1.6.17/build/Windows/LibPng-Release.vgdbsettings delete mode 100644 External/lpng-1.6.17/build/Windows/LibPng.props delete mode 100644 External/lpng-1.6.17/build/Windows/LibPng.vcxproj delete mode 100644 External/lpng-1.6.17/build/Windows/LibPng.vcxproj.filters delete mode 100644 External/lpng-1.6.17/build/Windows/jni/Android.mk delete mode 100644 External/lpng-1.6.17/build/Windows/jni/Application.mk delete mode 100644 External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems delete mode 100644 External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters delete mode 100644 External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj delete mode 100644 External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters delete mode 100644 External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj delete mode 100644 External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters create mode 100644 External/lua-5.2.3/build/UWP/Lua.vcxproj create mode 100644 External/lua-5.2.3/build/UWP/Lua.vcxproj.filters create mode 100644 External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings create mode 100644 External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings create mode 100644 External/lua-5.2.3/build/Win32/Lua.vcxproj create mode 100644 External/lua-5.2.3/build/Win32/Lua.vcxproj.filters create mode 100644 External/lua-5.2.3/build/Win32/jni/Android.mk create mode 100644 External/lua-5.2.3/build/Win32/jni/Application.mk create mode 100644 External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems create mode 100644 External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters delete mode 100644 External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings delete mode 100644 External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings delete mode 100644 External/lua-5.2.3/build/Windows/Lua.vcxproj delete mode 100644 External/lua-5.2.3/build/Windows/Lua.vcxproj.filters delete mode 100644 External/lua-5.2.3/build/Windows/jni/Android.mk delete mode 100644 External/lua-5.2.3/build/Windows/jni/Application.mk delete mode 100644 External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems delete mode 100644 External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters delete mode 100644 External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj delete mode 100644 External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters delete mode 100644 External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj delete mode 100644 External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters delete mode 100644 External/zlib-1.2.8/CMakeLists.txt create mode 100644 External/zlib-1.2.8/CMakeLists.~txt create mode 100644 External/zlib-1.2.8/build/UWP/zlib.vcxproj create mode 100644 External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters create mode 100644 External/zlib-1.2.8/build/Win32/jni/Android.mk create mode 100644 External/zlib-1.2.8/build/Win32/jni/Application.mk create mode 100644 External/zlib-1.2.8/build/Win32/zlib-Debug.vgdbsettings create mode 100644 External/zlib-1.2.8/build/Win32/zlib-Release.vgdbsettings create mode 100644 External/zlib-1.2.8/build/Win32/zlib.vcxproj create mode 100644 External/zlib-1.2.8/build/Win32/zlib.vcxproj.filters create mode 100644 External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems create mode 100644 External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters create mode 100644 External/zlib-1.2.8/build/Windows.Shared/zlib.props delete mode 100644 External/zlib-1.2.8/build/Windows/jni/Android.mk delete mode 100644 External/zlib-1.2.8/build/Windows/jni/Application.mk delete mode 100644 External/zlib-1.2.8/build/Windows/zlib-Debug.vgdbsettings delete mode 100644 External/zlib-1.2.8/build/Windows/zlib-Release.vgdbsettings delete mode 100644 External/zlib-1.2.8/build/Windows/zlib.props delete mode 100644 External/zlib-1.2.8/build/Windows/zlib.vcxproj delete mode 100644 External/zlib-1.2.8/build/Windows/zlib.vcxproj.filters delete mode 100644 External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems delete mode 100644 External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters delete mode 100644 External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj delete mode 100644 External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters delete mode 100644 External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj delete mode 100644 External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters create mode 100644 RenderScript/build/UWP/RenderScript.vcxproj create mode 100644 RenderScript/build/UWP/RenderScript.vcxproj.filters create mode 100644 RenderScript/build/Win32/RenderScript-Debug.vgdbsettings create mode 100644 RenderScript/build/Win32/RenderScript-Release.vgdbsettings create mode 100644 RenderScript/build/Win32/RenderScript.vcxproj create mode 100644 RenderScript/build/Win32/RenderScript.vcxproj.filters create mode 100644 RenderScript/build/Win32/jni/Android.mk create mode 100644 RenderScript/build/Win32/jni/Application.mk create mode 100644 RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems create mode 100644 RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems.filters create mode 100644 RenderScript/build/Windows.Shared/RenderScript.props delete mode 100644 RenderScript/build/Windows/EngineRoot.props delete mode 100644 RenderScript/build/Windows/RenderScript-Debug.vgdbsettings delete mode 100644 RenderScript/build/Windows/RenderScript-Release.vgdbsettings delete mode 100644 RenderScript/build/Windows/RenderScript.props delete mode 100644 RenderScript/build/Windows/RenderScript.vcxproj delete mode 100644 RenderScript/build/Windows/RenderScript.vcxproj.filters delete mode 100644 RenderScript/build/Windows/jni/Android.mk delete mode 100644 RenderScript/build/Windows/jni/Application.mk delete mode 100644 RenderScript/build/WindowsStore/EngineRoot.props delete mode 100644 RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems delete mode 100644 RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters delete mode 100644 RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj delete mode 100644 RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters delete mode 100644 RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj delete mode 100644 RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters create mode 100644 RenderScript/include/BlendStateDescParser.h delete mode 100644 RenderScript/include/BlendStateParser.h create mode 100644 RenderScript/include/DepthStencilStateDescParser.h delete mode 100644 RenderScript/include/DepthStencilStateParser.h create mode 100644 RenderScript/include/InputLayoutDescParser.h delete mode 100644 RenderScript/include/LayoutDescParser.h create mode 100644 RenderScript/include/PSODescParser.h create mode 100644 RenderScript/include/RasterizerStateDescParser.h delete mode 100644 RenderScript/include/RasterizerStateParser.h create mode 100644 RenderScript/include/ShaderResourceBindingParser.h create mode 100644 RenderScript/src/BlendStateDescParser.cpp delete mode 100644 RenderScript/src/BlendStateParser.cpp create mode 100644 RenderScript/src/DepthStencilStateDescParser.cpp delete mode 100644 RenderScript/src/DepthStencilStateParser.cpp create mode 100644 RenderScript/src/InputLayoutDescParser.cpp delete mode 100644 RenderScript/src/LayoutDescParser.cpp create mode 100644 RenderScript/src/PSODescParser.cpp create mode 100644 RenderScript/src/RasterizerStateDescParser.cpp delete mode 100644 RenderScript/src/RasterizerStateParser.cpp create mode 100644 RenderScript/src/ShaderResourceBindingParser.cpp 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 delete mode 100644 build/Windows/Tools.sln delete mode 100644 build/WindowsStore/Tools.sln diff --git a/ConfiurationNotes.txt b/ConfiurationNotes.txt deleted file mode 100644 index 842ffca..0000000 --- a/ConfiurationNotes.txt +++ /dev/null @@ -1,3 +0,0 @@ -1. Install Anroid SDK, NDK, ant, Java SDK -2. Set ANDROID_NDK_PATH (this is required for IntelliSense) -3. Configure all paths in Visual GDB \ No newline at end of file diff --git a/External/libjpeg-9a/build/UWP/libjpeg.vcxproj b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj new file mode 100644 index 0000000..cfb0441 --- /dev/null +++ b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj @@ -0,0 +1,206 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {d74e2843-18a5-402f-8df3-be013a574ca7} + StaticLibrary + Tools + 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 + NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NO_GETENV;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/libjpeg-9a/build/UWP/libjpeg.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/Win32/jni/Android.mk b/External/libjpeg-9a/build/Win32/jni/Android.mk new file mode 100644 index 0000000..97f2a71 --- /dev/null +++ b/External/libjpeg-9a/build/Win32/jni/Android.mk @@ -0,0 +1,22 @@ + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + +# Project configuration +LOCAL_MODULE := LibJpeg +# Force .c files to compile as c++ +LOCAL_CFLAGS := -DPLATFORM_ANDROID +LOCAL_CPP_FEATURES := +LOCAL_STATIC_LIBRARIES += + +# Include paths +PROJECT_ROOT := $(LOCAL_PATH)/../../../ +LOCAL_C_INCLUDES := $(PROJECT_ROOT) + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../jaricom.c ../../../jcapimin.c ../../../jcapistd.c ../../../jcarith.c ../../../jccoefct.c ../../../jccolor.c ../../../jcdctmgr.c ../../../jchuff.c ../../../jcinit.c ../../../jcmainct.c ../../../jcmarker.c ../../../jcmaster.c ../../../jcomapi.c ../../../jcparam.c ../../../jcprepct.c ../../../jcsample.c ../../../jctrans.c ../../../jdapimin.c ../../../jdapistd.c ../../../jdarith.c ../../../jdatadst.c ../../../jdatasrc.c ../../../jdcoefct.c ../../../jdcolor.c ../../../jddctmgr.c ../../../jdhuff.c ../../../jdinput.c ../../../jdmainct.c ../../../jdmarker.c ../../../jdmaster.c ../../../jdmerge.c ../../../jdpostct.c ../../../jdsample.c ../../../jdtrans.c ../../../jerror.c ../../../jfdctflt.c ../../../jfdctfst.c ../../../jfdctint.c ../../../jidctflt.c ../../../jidctfst.c ../../../jidctint.c ../../../jmemmgr.c ../../../jmemnobs.c ../../../jquant1.c ../../../jquant2.c ../../../jutils.c + +include $(BUILD_STATIC_LIBRARY) diff --git a/External/libjpeg-9a/build/Win32/jni/Application.mk b/External/libjpeg-9a/build/Win32/jni/Application.mk new file mode 100644 index 0000000..9069430 --- /dev/null +++ b/External/libjpeg-9a/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 := LibJpeg \ No newline at end of file diff --git a/External/libjpeg-9a/build/Win32/libjpeg-Debug.vgdbsettings b/External/libjpeg-9a/build/Win32/libjpeg-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/External/libjpeg-9a/build/Win32/libjpeg-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/External/libjpeg-9a/build/Win32/libjpeg-Release.vgdbsettings b/External/libjpeg-9a/build/Win32/libjpeg-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/External/libjpeg-9a/build/Win32/libjpeg-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/External/libjpeg-9a/build/Win32/libjpeg.vcxproj b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj new file mode 100644 index 0000000..37af815 --- /dev/null +++ b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj @@ -0,0 +1,432 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + Disabled + Disabled + false + false + true + true + true + true + + + true + true + true + true + + + + + + + + {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} + Win32Proj + jpeg + + + + StaticLibrary + false + true + v140 + + + StaticLibrary + false + true + v140 + + + v140 + StaticLibrary + + + v140 + StaticLibrary + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + NotUsing + Full + true + false + WIN32;NDEBUG;%(PreprocessorDefinitions) + true + true + + + Windows + true + true + true + + + + + Level3 + NotUsing + Full + true + false + WIN32;NDEBUG;%(PreprocessorDefinitions) + true + true + + + Windows + true + true + true + + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + + + + + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/Win32/libjpeg.vcxproj.filters b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj.filters new file mode 100644 index 0000000..3ef9e6b --- /dev/null +++ b/External/libjpeg-9a/build/Win32/libjpeg.vcxproj.filters @@ -0,0 +1,159 @@ + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + + + {70be1acb-0648-4940-8532-5ca94ba945a3} + + + {1941e9e3-738b-4533-8c58-2971cd8bcdcc} + + + + + jni + + + jni + + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems new file mode 100644 index 0000000..0f9938f --- /dev/null +++ b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems @@ -0,0 +1,83 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {e0ca2a6c-095a-454e-b566-31e81d91615d} + libjpeg + libjpeg.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters new file mode 100644 index 0000000..e914f53 --- /dev/null +++ b/External/libjpeg-9a/build/Windows.Shared/libjpeg.Shared.vcxitems.filters @@ -0,0 +1,183 @@ + + + + + {11a20d43-8d7e-426b-bcfe-4e3324c288e3} + + + {20845c30-1392-4a02-b87c-e0d59d5b2245} + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows.Shared/libjpeg.props b/External/libjpeg-9a/build/Windows.Shared/libjpeg.props new file mode 100644 index 0000000..ca5e223 --- /dev/null +++ b/External/libjpeg-9a/build/Windows.Shared/libjpeg.props @@ -0,0 +1,14 @@ + + + + + + + + _LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 4100;4505;4244;4127 + + + + \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows/jni/Android.mk b/External/libjpeg-9a/build/Windows/jni/Android.mk deleted file mode 100644 index 97f2a71..0000000 --- a/External/libjpeg-9a/build/Windows/jni/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - -# Project configuration -LOCAL_MODULE := LibJpeg -# Force .c files to compile as c++ -LOCAL_CFLAGS := -DPLATFORM_ANDROID -LOCAL_CPP_FEATURES := -LOCAL_STATIC_LIBRARIES += - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../../ -LOCAL_C_INCLUDES := $(PROJECT_ROOT) - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../jaricom.c ../../../jcapimin.c ../../../jcapistd.c ../../../jcarith.c ../../../jccoefct.c ../../../jccolor.c ../../../jcdctmgr.c ../../../jchuff.c ../../../jcinit.c ../../../jcmainct.c ../../../jcmarker.c ../../../jcmaster.c ../../../jcomapi.c ../../../jcparam.c ../../../jcprepct.c ../../../jcsample.c ../../../jctrans.c ../../../jdapimin.c ../../../jdapistd.c ../../../jdarith.c ../../../jdatadst.c ../../../jdatasrc.c ../../../jdcoefct.c ../../../jdcolor.c ../../../jddctmgr.c ../../../jdhuff.c ../../../jdinput.c ../../../jdmainct.c ../../../jdmarker.c ../../../jdmaster.c ../../../jdmerge.c ../../../jdpostct.c ../../../jdsample.c ../../../jdtrans.c ../../../jerror.c ../../../jfdctflt.c ../../../jfdctfst.c ../../../jfdctint.c ../../../jidctflt.c ../../../jidctfst.c ../../../jidctint.c ../../../jmemmgr.c ../../../jmemnobs.c ../../../jquant1.c ../../../jquant2.c ../../../jutils.c - -include $(BUILD_STATIC_LIBRARY) diff --git a/External/libjpeg-9a/build/Windows/jni/Application.mk b/External/libjpeg-9a/build/Windows/jni/Application.mk deleted file mode 100644 index 9069430..0000000 --- a/External/libjpeg-9a/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 := LibJpeg \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows/libjpeg-Debug.vgdbsettings b/External/libjpeg-9a/build/Windows/libjpeg-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/External/libjpeg-9a/build/Windows/libjpeg-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/External/libjpeg-9a/build/Windows/libjpeg-Release.vgdbsettings b/External/libjpeg-9a/build/Windows/libjpeg-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/External/libjpeg-9a/build/Windows/libjpeg-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/External/libjpeg-9a/build/Windows/libjpeg.props b/External/libjpeg-9a/build/Windows/libjpeg.props deleted file mode 100644 index f75804a..0000000 --- a/External/libjpeg-9a/build/Windows/libjpeg.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - _LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - NotUsing - - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj b/External/libjpeg-9a/build/Windows/libjpeg.vcxproj deleted file mode 100644 index 1fd7411..0000000 --- a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj +++ /dev/null @@ -1,432 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - Disabled - Disabled - false - false - true - true - true - true - - - true - true - true - true - - - - - - - - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} - Win32Proj - jpeg - - - - StaticLibrary - false - true - v140 - - - StaticLibrary - false - true - v140 - - - v140 - StaticLibrary - - - v140 - StaticLibrary - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - NotUsing - Full - true - false - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - true - - - Windows - true - true - true - - - - - Level3 - NotUsing - Full - true - false - WIN32;NDEBUG;%(PreprocessorDefinitions) - true - true - - - Windows - true - true - true - - - - - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - NotUsing - - - - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj.filters b/External/libjpeg-9a/build/Windows/libjpeg.vcxproj.filters deleted file mode 100644 index 3ef9e6b..0000000 --- a/External/libjpeg-9a/build/Windows/libjpeg.vcxproj.filters +++ /dev/null @@ -1,159 +0,0 @@ - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - - - {70be1acb-0648-4940-8532-5ca94ba945a3} - - - {1941e9e3-738b-4533-8c58-2971cd8bcdcc} - - - - - jni - - - jni - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems b/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems deleted file mode 100644 index c43f27c..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems +++ /dev/null @@ -1,78 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {e0ca2a6c-095a-454e-b566-31e81d91615d} - libjpeg - libjpeg.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters b/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters deleted file mode 100644 index b28663c..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Shared/libjpeg.Shared.vcxitems.filters +++ /dev/null @@ -1,180 +0,0 @@ - - - - - {11a20d43-8d7e-426b-bcfe-4e3324c288e3} - - - {20845c30-1392-4a02-b87c-e0d59d5b2245} - - - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj b/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj deleted file mode 100644 index e0fdc2c..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj +++ /dev/null @@ -1,199 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {3cce7ebc-96c9-4f40-8983-5c99f584b3b1} - libjpeg - 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 - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters b/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.Windows/libjpeg.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj b/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj deleted file mode 100644 index 5b7f606..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj +++ /dev/null @@ -1,140 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {78f7acd1-114d-483d-b92a-bab53519f0d5} - libjpeg - 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 - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - NO_GETENV;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters b/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/libjpeg-9a/build/WindowsStore/libjpeg.WindowsPhone/libjpeg.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj new file mode 100644 index 0000000..7fbb7f4 --- /dev/null +++ b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj @@ -0,0 +1,215 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + + + {6c30470e-39a5-4a89-8f0a-254e3c84ee96} + StaticLibrary + LibTiff + 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 + PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4996 + + + Console + false + false + + + + + false + true + PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4996 + + + Console + false + false + + + + + false + true + PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4996 + + + Console + false + false + + + + + false + true + PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4996 + + + Console + false + false + + + + + false + true + PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4996;4311;4312 + + + Console + false + false + + + + + false + true + PLATFORM_WINDOWS_STORE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4996;4311;4312 + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters new file mode 100644 index 0000000..ea9b788 --- /dev/null +++ b/External/libtiff-4.0.3/build/UWP/LibTiff.vcxproj.filters @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Win32/LibTiff-Debug.vgdbsettings b/External/libtiff-4.0.3/build/Win32/LibTiff-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/External/libtiff-4.0.3/build/Win32/LibTiff-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/External/libtiff-4.0.3/build/Win32/LibTiff-Release.vgdbsettings b/External/libtiff-4.0.3/build/Win32/LibTiff-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/External/libtiff-4.0.3/build/Win32/LibTiff-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/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj new file mode 100644 index 0000000..6744d00 --- /dev/null +++ b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj @@ -0,0 +1,383 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1} + Win32Proj + LibTiff + + + + StaticLibrary + true + v140 + + + StaticLibrary + false + v140 + true + + + v140 + StaticLibrary + + + v140 + StaticLibrary + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Disabled + WIN32;PLATFORM_WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + + + + + MaxSpeed + true + true + WIN32;PLATFORM_WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Disabled + + + + + + PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj.filters b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj.filters new file mode 100644 index 0000000..b4a3ee8 --- /dev/null +++ b/External/libtiff-4.0.3/build/Win32/LibTiff.vcxproj.filters @@ -0,0 +1,153 @@ + + + + + {b7c226da-07ab-4d37-8a80-99608067b1a0} + + + {a399fd91-dda7-43e2-a5d5-fa89b67c044f} + + + {8120c64e-73be-44e0-a0f6-81d9e91d9695} + + + {f62d83ea-9b26-432c-87e1-a84a2a998e66} + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src\port + + + win_src + + + + + jni + + + jni + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Win32/jni/Android.mk b/External/libtiff-4.0.3/build/Win32/jni/Android.mk new file mode 100644 index 0000000..9dfa012 --- /dev/null +++ b/External/libtiff-4.0.3/build/Win32/jni/Android.mk @@ -0,0 +1,27 @@ + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + +# Project configuration +LOCAL_MODULE := LibTiff +# Force .c files to compile as c++ +LOCAL_CFLAGS := -DPLATFORM_ANDROID +LOCAL_CPP_FEATURES := +LOCAL_STATIC_LIBRARIES += + +# Include paths +PROJECT_ROOT := $(LOCAL_PATH)/../../../ +LOCAL_C_INCLUDES := $(PROJECT_ROOT)/libtiff + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../libtiff/tif_aux.c ../../../libtiff/tif_close.c ../../../libtiff/tif_codec.c ../../../libtiff/tif_color.c ../../../libtiff/tif_compress.c ../../../libtiff/tif_dir.c ../../../libtiff/tif_dirinfo.c ../../../libtiff/tif_dirread.c ../../../libtiff/tif_dirwrite.c ../../../libtiff/tif_dumpmode.c ../../../libtiff/tif_error.c ../../../libtiff/tif_extension.c ../../../libtiff/tif_fax3.c ../../../libtiff/tif_fax3sm.c ../../../libtiff/tif_flush.c ../../../libtiff/tif_getimage.c ../../../libtiff/tif_jbig.c ../../../libtiff/tif_jpeg.c ../../../libtiff/tif_jpeg_12.c ../../../libtiff/tif_luv.c ../../../libtiff/tif_lzma.c ../../../libtiff/tif_lzw.c ../../../libtiff/tif_next.c ../../../libtiff/tif_ojpeg.c ../../../libtiff/tif_open.c ../../../libtiff/tif_packbits.c ../../../libtiff/tif_pixarlog.c ../../../libtiff/tif_predict.c ../../../libtiff/tif_print.c ../../../libtiff/tif_read.c ../../../libtiff/tif_stream.cxx ../../../libtiff/tif_strip.c ../../../libtiff/tif_swab.c ../../../libtiff/tif_thunder.c ../../../libtiff/tif_tile.c ../../../libtiff/tif_unix.c ../../../libtiff/tif_version.c ../../../libtiff/tif_warning.c ../../../libtiff/tif_win32.c ../../../libtiff/tif_write.c ../../../libtiff/tif_zip.c ../../../port/lfind.c + +#VisualGDBAndroid: VSExcludeListLocation +VISUALGDB_VS_EXCLUDED_FILES_Release :=../../../libtiff/tif_win32.c +VISUALGDB_VS_EXCLUDED_FILES_Debug := ../../../libtiff/tif_win32.c +LOCAL_SRC_FILES := $(filter-out $(VISUALGDB_VS_EXCLUDED_FILES_$(VGDB_VSCONFIG)),$(LOCAL_SRC_FILES)) + +include $(BUILD_STATIC_LIBRARY) diff --git a/External/libtiff-4.0.3/build/Win32/jni/Application.mk b/External/libtiff-4.0.3/build/Win32/jni/Application.mk new file mode 100644 index 0000000..123dcab --- /dev/null +++ b/External/libtiff-4.0.3/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 := LibTiff \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems new file mode 100644 index 0000000..14a4d9b --- /dev/null +++ b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems @@ -0,0 +1,91 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {0e12baa7-7b7d-406f-8374-075598833b2a} + LibTiff + LibTiff.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters new file mode 100644 index 0000000..b90bfbe --- /dev/null +++ b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.Shared.vcxitems.filters @@ -0,0 +1,197 @@ + + + + + {44e40e9c-de7c-47b8-a3bc-5951cd5a666a} + + + {8d141b45-6d56-476d-b41b-77c14279f2d8} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + include + + + + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.props b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.props new file mode 100644 index 0000000..4b485c0 --- /dev/null +++ b/External/libtiff-4.0.3/build/Windows.Shared/LibTiff.props @@ -0,0 +1,14 @@ + + + + + + + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + Level3 + + + + \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff-Debug.vgdbsettings b/External/libtiff-4.0.3/build/Windows/LibTiff-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/External/libtiff-4.0.3/build/Windows/LibTiff-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/External/libtiff-4.0.3/build/Windows/LibTiff-Release.vgdbsettings b/External/libtiff-4.0.3/build/Windows/LibTiff-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/External/libtiff-4.0.3/build/Windows/LibTiff-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/External/libtiff-4.0.3/build/Windows/LibTiff.props b/External/libtiff-4.0.3/build/Windows/LibTiff.props deleted file mode 100644 index 8015e0f..0000000 --- a/External/libtiff-4.0.3/build/Windows/LibTiff.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - NotUsing - - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj b/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj deleted file mode 100644 index 44a308b..0000000 --- a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj +++ /dev/null @@ -1,385 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1} - Win32Proj - LibTiff - - - - StaticLibrary - true - v140 - - - StaticLibrary - false - v140 - true - - - v140 - StaticLibrary - - - v140 - StaticLibrary - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - WIN32;PLATFORM_WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - MaxSpeed - true - true - WIN32;PLATFORM_WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Disabled - - - - - - PLATFORM_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - - - - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj.filters b/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj.filters deleted file mode 100644 index b4a3ee8..0000000 --- a/External/libtiff-4.0.3/build/Windows/LibTiff.vcxproj.filters +++ /dev/null @@ -1,153 +0,0 @@ - - - - - {b7c226da-07ab-4d37-8a80-99608067b1a0} - - - {a399fd91-dda7-43e2-a5d5-fa89b67c044f} - - - {8120c64e-73be-44e0-a0f6-81d9e91d9695} - - - {f62d83ea-9b26-432c-87e1-a84a2a998e66} - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src\port - - - win_src - - - - - jni - - - jni - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/Windows/jni/Android.mk b/External/libtiff-4.0.3/build/Windows/jni/Android.mk deleted file mode 100644 index 9dfa012..0000000 --- a/External/libtiff-4.0.3/build/Windows/jni/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - -# Project configuration -LOCAL_MODULE := LibTiff -# Force .c files to compile as c++ -LOCAL_CFLAGS := -DPLATFORM_ANDROID -LOCAL_CPP_FEATURES := -LOCAL_STATIC_LIBRARIES += - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../../ -LOCAL_C_INCLUDES := $(PROJECT_ROOT)/libtiff - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../libtiff/tif_aux.c ../../../libtiff/tif_close.c ../../../libtiff/tif_codec.c ../../../libtiff/tif_color.c ../../../libtiff/tif_compress.c ../../../libtiff/tif_dir.c ../../../libtiff/tif_dirinfo.c ../../../libtiff/tif_dirread.c ../../../libtiff/tif_dirwrite.c ../../../libtiff/tif_dumpmode.c ../../../libtiff/tif_error.c ../../../libtiff/tif_extension.c ../../../libtiff/tif_fax3.c ../../../libtiff/tif_fax3sm.c ../../../libtiff/tif_flush.c ../../../libtiff/tif_getimage.c ../../../libtiff/tif_jbig.c ../../../libtiff/tif_jpeg.c ../../../libtiff/tif_jpeg_12.c ../../../libtiff/tif_luv.c ../../../libtiff/tif_lzma.c ../../../libtiff/tif_lzw.c ../../../libtiff/tif_next.c ../../../libtiff/tif_ojpeg.c ../../../libtiff/tif_open.c ../../../libtiff/tif_packbits.c ../../../libtiff/tif_pixarlog.c ../../../libtiff/tif_predict.c ../../../libtiff/tif_print.c ../../../libtiff/tif_read.c ../../../libtiff/tif_stream.cxx ../../../libtiff/tif_strip.c ../../../libtiff/tif_swab.c ../../../libtiff/tif_thunder.c ../../../libtiff/tif_tile.c ../../../libtiff/tif_unix.c ../../../libtiff/tif_version.c ../../../libtiff/tif_warning.c ../../../libtiff/tif_win32.c ../../../libtiff/tif_write.c ../../../libtiff/tif_zip.c ../../../port/lfind.c - -#VisualGDBAndroid: VSExcludeListLocation -VISUALGDB_VS_EXCLUDED_FILES_Release :=../../../libtiff/tif_win32.c -VISUALGDB_VS_EXCLUDED_FILES_Debug := ../../../libtiff/tif_win32.c -LOCAL_SRC_FILES := $(filter-out $(VISUALGDB_VS_EXCLUDED_FILES_$(VGDB_VSCONFIG)),$(LOCAL_SRC_FILES)) - -include $(BUILD_STATIC_LIBRARY) diff --git a/External/libtiff-4.0.3/build/Windows/jni/Application.mk b/External/libtiff-4.0.3/build/Windows/jni/Application.mk deleted file mode 100644 index 123dcab..0000000 --- a/External/libtiff-4.0.3/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 := LibTiff \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems deleted file mode 100644 index 3e962cd..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems +++ /dev/null @@ -1,86 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {0e12baa7-7b7d-406f-8374-075598833b2a} - LibTiff - LibTiff.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters deleted file mode 100644 index 852bb32..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Shared/LibTiff.Shared.vcxitems.filters +++ /dev/null @@ -1,194 +0,0 @@ - - - - - {44e40e9c-de7c-47b8-a3bc-5951cd5a666a} - - - {8d141b45-6d56-476d-b41b-77c14279f2d8} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - - - include - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj deleted file mode 100644 index 1229ea6..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - - - {e9e719dd-05cf-4ad2-ac3b-1035ddadbb56} - LibTiff - 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 - - - - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - false - 4996 - - - Console - false - false - - - - - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - false - 4996 - - - Console - false - false - - - - - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - false - 4996 - - - Console - false - false - - - - - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - false - 4996 - - - Console - false - false - - - - - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - false - 4996 - - - Console - false - false - - - - - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - false - 4996 - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters deleted file mode 100644 index ecd2222..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.Windows/LibTiff.Windows.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {ea26bfa5-f43b-4ad2-bd0b-24fdad22ddab} - - - - - winrt_src - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj deleted file mode 100644 index 93221b2..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj +++ /dev/null @@ -1,147 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - - - - {c589bb57-4e44-42e9-a77e-827f5e68eedb} - LibTiff - 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 - - - - false - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - 4996 - - - Console - false - false - - - - - false - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - 4996 - - - Console - false - false - - - - - false - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - 4996 - - - Console - false - false - - - - - false - false - PLATFORM_WINDOWS_STORE;%(PreprocessorDefinitions) - 4996 - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters b/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters deleted file mode 100644 index 7458feb..0000000 --- a/External/libtiff-4.0.3/build/WindowsStore/LibTiff.WindowsPhone/LibTiff.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {5b011697-c139-4c28-af24-c20e91060fcf} - - - - - winrt_src - - - \ No newline at end of file diff --git a/External/libtiff-4.0.3/libtiff/tif_config.h b/External/libtiff-4.0.3/libtiff/tif_config.h index d069607..8d039a1 100644 --- a/External/libtiff-4.0.3/libtiff/tif_config.h +++ b/External/libtiff-4.0.3/libtiff/tif_config.h @@ -1,4 +1,4 @@ -#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_WINDOWS_STORE) +#if defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS) # include "tif_config.vc.h" diff --git a/External/libtiff-4.0.3/libtiff/tiffconf.h b/External/libtiff-4.0.3/libtiff/tiffconf.h index 0649d5e..cd026b2 100644 --- a/External/libtiff-4.0.3/libtiff/tiffconf.h +++ b/External/libtiff-4.0.3/libtiff/tiffconf.h @@ -1,4 +1,4 @@ -#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_WINDOWS_STORE) +#if defined(PLATFORM_WIN32) || defined(PLATFORM_UNIVERSAL_WINDOWS) # include "tiffconf.vc.h" diff --git a/External/lpng-1.6.17/CMakeLists.txt b/External/lpng-1.6.17/CMakeLists.txt deleted file mode 100644 index f062a23..0000000 --- a/External/lpng-1.6.17/CMakeLists.txt +++ /dev/null @@ -1,374 +0,0 @@ -# CMakeLists.txt - -# Copyright (C) 2007-2015 Glenn Randers-Pehrson - -# This code is released under the libpng license. -# For conditions of distribution and use, see the disclaimer -# and license in png.h - -cmake_minimum_required(VERSION 2.4.4) -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo") - -project(libpng C) -enable_testing() - -set(PNGLIB_MAJOR 1) -set(PNGLIB_MINOR 6) -set(PNGLIB_RELEASE 17) -set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) -set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) - -# needed packages -find_package(ZLIB REQUIRED) -include_directories(${ZLIB_INCLUDE_DIR}) - -if(NOT WIN32) - find_library(M_LIBRARY - NAMES m - PATHS /usr/lib /usr/local/lib - ) - if(NOT M_LIBRARY) - message(STATUS "math lib 'libm' not found; floating point support disabled") - endif() -else() - # not needed on windows - set(M_LIBRARY "") -endif() - -# COMMAND LINE OPTIONS -option(PNG_SHARED "Build shared lib" ON) -option(PNG_STATIC "Build static lib" ON) -option(PNG_TESTS "Build libpng tests" ON) - -# Many more configuration options could be added here -option(PNG_FRAMEWORK "Build OS X framework" OFF) -option(PNG_DEBUG "Build with debug output" OFF) -option(PNGARG "Disable ANSI-C prototypes" OFF) - -# SET LIBNAME -set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR}) - -# to distinguish between debug and release lib -set(CMAKE_DEBUG_POSTFIX "d") - -# Use the prebuilt pnglibconf.h file from the scripts folder -# TODO: fix this by building with awk; without this no cmake build can be -# configured directly (to do so indirectly use your local awk to build a -# pnglibconf.h in the build directory.) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt - ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -# OUR SOURCES -set(libpng_public_hdrs - png.h - pngconf.h - ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h -) -set(libpng_sources - ${libpng_public_hdrs} - pngdebug.h - pnginfo.h - pngpriv.h - pngstruct.h - png.c - pngerror.c - pngget.c - pngmem.c - pngpread.c - pngread.c - pngrio.c - pngrtran.c - pngrutil.c - pngset.c - pngtrans.c - pngwio.c - pngwrite.c - pngwtran.c - pngwutil.c -) -set(pngtest_sources - pngtest.c -) -set(pngvalid_sources - contrib/libtests/pngvalid.c -) -set(pngstest_sources - contrib/libtests/pngstest.c -) -# SOME NEEDED DEFINITIONS - -if(MSVC) - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) -endif(MSVC) - -if(PNG_DEBUG) - add_definitions(-DPNG_DEBUG) -endif() - -# NOW BUILD OUR TARGET -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) - -unset(PNG_LIB_TARGETS) - -if(PNG_SHARED) - add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) - set(PNG_LIB_TARGETS ${PNG_LIB_NAME}) - if(MSVC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib") - set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") - endif() - target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) -endif() - -if(PNG_STATIC) - # does not work without changing name - set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static) - add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources}) - list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_STATIC}) - if(MSVC) - # msvc does not append 'lib' - do it here to have consistent name - set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib") - endif() - target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY}) -endif() - -if(PNG_FRAMEWORK) - set(PNG_LIB_NAME_FRAMEWORK ${PNG_LIB_NAME}_framework) - add_library(${PNG_LIB_NAME_FRAMEWORK} SHARED ${libpng_sources}) - list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_FRAMEWORK}) - set_target_properties(${PNG_LIB_NAME_FRAMEWORK} PROPERTIES - FRAMEWORK TRUE - FRAMEWORK_VERSION ${PNGLIB_VERSION} - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PNGLIB_MAJOR}.${PNGLIB_MINOR} - MACOSX_FRAMEWORK_BUNDLE_VERSION ${PNGLIB_VERSION} - MACOSX_FRAMEWORK_IDENTIFIER org.libpng.libpng - XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" - PUBLIC_HEADER "${libpng_public_hdrs}" - OUTPUT_NAME png) - target_link_libraries(${PNG_LIB_NAME_FRAMEWORK} ${ZLIB_LIBRARY} ${M_LIBRARY}) -endif() - -if(NOT PNG_LIB_TARGETS) - message(SEND_ERROR - "No library variant selected to build. " - "Please enable at least one of the following options: " - " PNG_STATIC, PNG_SHARED, PNG_FRAMEWORK") -endif() - -if(PNG_SHARED AND WIN32) - set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL) -endif() - -if(PNG_TESTS AND PNG_SHARED) - # does not work with msvc due to png_lib_ver issue - add_executable(pngtest ${pngtest_sources}) - target_link_libraries(pngtest ${PNG_LIB_NAME}) - add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png) - # - add_executable(pngvalid ${pngvalid_sources}) - target_link_libraries(pngvalid ${PNG_LIB_NAME}) - add_test(pngvalid ./pngvalid) - add_executable(pngstest ${pngstest_sources}) - target_link_libraries(pngstest ${PNG_LIB_NAME}) - add_test(pngstest ./pngstest - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g01.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g02.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g04.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p01.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p02.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p04.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g01.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g02.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g04.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn2c16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn2c16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbrn2c08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn0g16.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbyn3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n0g08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n2c08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n3p08.png - ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp1n3p08.png - ) -endif() - -# Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set -IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") -ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) - -# Set a variable with CMake code which: -# Creates a symlink from src to dest (if possible) or alternatively -# copies if different. -macro(CREATE_SYMLINK SRC_FILE DEST_FILE) - FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) - if(WIN32 AND NOT CYGWIN AND NOT MSYS) - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE} - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE} - DEPENDS ${PNG_LIB_TARGETS} - ) - ADD_CUSTOM_TARGET(${DEST_FILE}_COPY ALL DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) - else(WIN32 AND NOT CYGWIN AND NOT MSYS) - get_filename_component(LINK_TARGET "${SRC_FILE}" NAME) - execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) - endif(WIN32 AND NOT CYGWIN AND NOT MSYS) -endmacro() - -# libpng is a library so default to 'lib' -if(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR lib) -endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) - -# CREATE PKGCONFIG FILES -# we use the same files like ./configure, so we have to set its vars -# Only do this on Windows for Cygwin - the files don't make much sense outside -# a UNIX look alike -if(NOT WIN32 OR CYGWIN OR MINGW) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix ${CMAKE_INSTALL_PREFIX}) - set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_PREFIX}/include) - set(LIBS "-lz -lm") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) - CREATE_SYMLINK(${PNGLIB_NAME}.pc libpng.pc) - - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in - ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) - CREATE_SYMLINK(${PNGLIB_NAME}-config libpng-config) -endif(NOT WIN32 OR CYGWIN OR MINGW) - -# SET UP LINKS -if(PNG_SHARED) - set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.17 - VERSION 16.${PNGLIB_RELEASE}.0 - SOVERSION 16 - CLEAN_DIRECT_OUTPUT 1) -endif() -if(PNG_STATIC) - # MSVC doesn't use a different file extension for shared vs. static - # libs. We are able to change OUTPUT_NAME to remove the _static - # for all other platforms. - if(NOT MSVC) - set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES - OUTPUT_NAME ${PNG_LIB_NAME} - CLEAN_DIRECT_OUTPUT 1) - endif() -endif() - -# If CMake > 2.4.x, we set a variable used below to export -# targets to an export file. -# TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2 -if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4) - set(PNG_EXPORT_RULE EXPORT libpng) -elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof - set(PNG_EXPORT_RULE EXPORT libpng) -endif() - -# INSTALL -if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS ${PNG_LIB_TARGETS} - ${PNG_EXPORT_RULE} - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(PNG_SHARED) - # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin - if(CYGWIN OR MINGW) - get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) - CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(CYGWIN OR MINGW) - - if(NOT WIN32) - get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) - CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_SHARED_LIBRARY_SUFFIX}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(NOT WIN32) - endif(PNG_SHARED) - - if(PNG_STATIC) - if(NOT WIN32 OR CYGWIN OR MINGW) - get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC} LOCATION_${CMAKE_BUILD_TYPE}) - CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_STATIC_LIBRARY_SUFFIX}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} - DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(NOT WIN32 OR CYGWIN OR MINGW) - endif() -endif() - -if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) - install(FILES ${libpng_public_hdrs} DESTINATION include) - install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME}) -endif() -if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL ) - if(NOT WIN32 OR CYGWIN OR MINGW) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config - DESTINATION bin) - endif(NOT WIN32 OR CYGWIN OR MINGW) -endif() - -if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) - # Install man pages - if(NOT PNG_MAN_DIR) - set(PNG_MAN_DIR "share/man") - endif() - install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) - install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) - # Install pkg-config files - if(NOT WIN32 OR CYGWIN OR MINGW) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config - DESTINATION bin) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config - DESTINATION bin) - endif(NOT WIN32 OR CYGWIN OR MINGW) -endif() - -# On versions of CMake that support it, create an export file CMake -# users can include() to import our targets -if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL ) - install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) -endif() - -# what's with libpng-manual.txt and all the extra files? - -# UNINSTALL -# do we need this? - -# DIST -# do we need this? - -# to create msvc import lib for mingw compiled shared lib -# pexports libpng.dll > libpng.def -# lib /def:libpng.def /machine:x86 - diff --git a/External/lpng-1.6.17/CMakeLists.~txt b/External/lpng-1.6.17/CMakeLists.~txt new file mode 100644 index 0000000..f062a23 --- /dev/null +++ b/External/lpng-1.6.17/CMakeLists.~txt @@ -0,0 +1,374 @@ +# CMakeLists.txt + +# Copyright (C) 2007-2015 Glenn Randers-Pehrson + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h + +cmake_minimum_required(VERSION 2.4.4) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + +set(CMAKE_CONFIGURATION_TYPES "Release;Debug;MinSizeRel;RelWithDebInfo") + +project(libpng C) +enable_testing() + +set(PNGLIB_MAJOR 1) +set(PNGLIB_MINOR 6) +set(PNGLIB_RELEASE 17) +set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) +set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) + +# needed packages +find_package(ZLIB REQUIRED) +include_directories(${ZLIB_INCLUDE_DIR}) + +if(NOT WIN32) + find_library(M_LIBRARY + NAMES m + PATHS /usr/lib /usr/local/lib + ) + if(NOT M_LIBRARY) + message(STATUS "math lib 'libm' not found; floating point support disabled") + endif() +else() + # not needed on windows + set(M_LIBRARY "") +endif() + +# COMMAND LINE OPTIONS +option(PNG_SHARED "Build shared lib" ON) +option(PNG_STATIC "Build static lib" ON) +option(PNG_TESTS "Build libpng tests" ON) + +# Many more configuration options could be added here +option(PNG_FRAMEWORK "Build OS X framework" OFF) +option(PNG_DEBUG "Build with debug output" OFF) +option(PNGARG "Disable ANSI-C prototypes" OFF) + +# SET LIBNAME +set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR}) + +# to distinguish between debug and release lib +set(CMAKE_DEBUG_POSTFIX "d") + +# Use the prebuilt pnglibconf.h file from the scripts folder +# TODO: fix this by building with awk; without this no cmake build can be +# configured directly (to do so indirectly use your local awk to build a +# pnglibconf.h in the build directory.) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt + ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +# OUR SOURCES +set(libpng_public_hdrs + png.h + pngconf.h + ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h +) +set(libpng_sources + ${libpng_public_hdrs} + pngdebug.h + pnginfo.h + pngpriv.h + pngstruct.h + png.c + pngerror.c + pngget.c + pngmem.c + pngpread.c + pngread.c + pngrio.c + pngrtran.c + pngrutil.c + pngset.c + pngtrans.c + pngwio.c + pngwrite.c + pngwtran.c + pngwutil.c +) +set(pngtest_sources + pngtest.c +) +set(pngvalid_sources + contrib/libtests/pngvalid.c +) +set(pngstest_sources + contrib/libtests/pngstest.c +) +# SOME NEEDED DEFINITIONS + +if(MSVC) + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) +endif(MSVC) + +if(PNG_DEBUG) + add_definitions(-DPNG_DEBUG) +endif() + +# NOW BUILD OUR TARGET +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) + +unset(PNG_LIB_TARGETS) + +if(PNG_SHARED) + add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) + set(PNG_LIB_TARGETS ${PNG_LIB_NAME}) + if(MSVC) + # msvc does not append 'lib' - do it here to have consistent name + set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib") + set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") + endif() + target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) +endif() + +if(PNG_STATIC) + # does not work without changing name + set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static) + add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources}) + list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_STATIC}) + if(MSVC) + # msvc does not append 'lib' - do it here to have consistent name + set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib") + endif() + target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY}) +endif() + +if(PNG_FRAMEWORK) + set(PNG_LIB_NAME_FRAMEWORK ${PNG_LIB_NAME}_framework) + add_library(${PNG_LIB_NAME_FRAMEWORK} SHARED ${libpng_sources}) + list(APPEND PNG_LIB_TARGETS ${PNG_LIB_NAME_FRAMEWORK}) + set_target_properties(${PNG_LIB_NAME_FRAMEWORK} PROPERTIES + FRAMEWORK TRUE + FRAMEWORK_VERSION ${PNGLIB_VERSION} + MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${PNGLIB_MAJOR}.${PNGLIB_MINOR} + MACOSX_FRAMEWORK_BUNDLE_VERSION ${PNGLIB_VERSION} + MACOSX_FRAMEWORK_IDENTIFIER org.libpng.libpng + XCODE_ATTRIBUTE_INSTALL_PATH "@rpath" + PUBLIC_HEADER "${libpng_public_hdrs}" + OUTPUT_NAME png) + target_link_libraries(${PNG_LIB_NAME_FRAMEWORK} ${ZLIB_LIBRARY} ${M_LIBRARY}) +endif() + +if(NOT PNG_LIB_TARGETS) + message(SEND_ERROR + "No library variant selected to build. " + "Please enable at least one of the following options: " + " PNG_STATIC, PNG_SHARED, PNG_FRAMEWORK") +endif() + +if(PNG_SHARED AND WIN32) + set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL) +endif() + +if(PNG_TESTS AND PNG_SHARED) + # does not work with msvc due to png_lib_ver issue + add_executable(pngtest ${pngtest_sources}) + target_link_libraries(pngtest ${PNG_LIB_NAME}) + add_test(pngtest ./pngtest ${CMAKE_CURRENT_SOURCE_DIR}/pngtest.png) + # + add_executable(pngvalid ${pngvalid_sources}) + target_link_libraries(pngvalid ${PNG_LIB_NAME}) + add_test(pngvalid ./pngvalid) + add_executable(pngstest ${pngstest_sources}) + target_link_libraries(pngstest ${PNG_LIB_NAME}) + add_test(pngstest ./pngstest + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g01.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g02.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g04.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn0g16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn2c16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p01.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p02.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p04.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn3p08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn4a16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/basn6a16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g01.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g02.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn0g04.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn2c16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbbn3p08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn2c16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbgn3p08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbrn2c08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn0g16.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbwn3p08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftbyn3p08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n0g08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n2c08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp0n3p08.png + ${CMAKE_CURRENT_SOURCE_DIR}/contrib/pngsuite/ftp1n3p08.png + ) +endif() + +# Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set +IF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "lib") +ENDIF(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) + +# Set a variable with CMake code which: +# Creates a symlink from src to dest (if possible) or alternatively +# copies if different. +macro(CREATE_SYMLINK SRC_FILE DEST_FILE) + FILE(REMOVE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) + if(WIN32 AND NOT CYGWIN AND NOT MSYS) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE} + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${SRC_FILE}" ${CMAKE_CURRENT_BINARY_DIR}/${DEST_FILE} + DEPENDS ${PNG_LIB_TARGETS} + ) + ADD_CUSTOM_TARGET(${DEST_FILE}_COPY ALL DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE}) + else(WIN32 AND NOT CYGWIN AND NOT MSYS) + get_filename_component(LINK_TARGET "${SRC_FILE}" NAME) + execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) + execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${LINK_TARGET}" ${DEST_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + endif(WIN32 AND NOT CYGWIN AND NOT MSYS) +endmacro() + +# libpng is a library so default to 'lib' +if(NOT DEFINED CMAKE_INSTALL_LIBDIR) + set(CMAKE_INSTALL_LIBDIR lib) +endif(NOT DEFINED CMAKE_INSTALL_LIBDIR) + +# CREATE PKGCONFIG FILES +# we use the same files like ./configure, so we have to set its vars +# Only do this on Windows for Cygwin - the files don't make much sense outside +# a UNIX look alike +if(NOT WIN32 OR CYGWIN OR MINGW) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix ${CMAKE_INSTALL_PREFIX}) + set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_PREFIX}/include) + set(LIBS "-lz -lm") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc @ONLY) + CREATE_SYMLINK(${PNGLIB_NAME}.pc libpng.pc) + + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in + ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config @ONLY) + CREATE_SYMLINK(${PNGLIB_NAME}-config libpng-config) +endif(NOT WIN32 OR CYGWIN OR MINGW) + +# SET UP LINKS +if(PNG_SHARED) + set_target_properties(${PNG_LIB_NAME} PROPERTIES +# VERSION 16.${PNGLIB_RELEASE}.1.6.17 + VERSION 16.${PNGLIB_RELEASE}.0 + SOVERSION 16 + CLEAN_DIRECT_OUTPUT 1) +endif() +if(PNG_STATIC) + # MSVC doesn't use a different file extension for shared vs. static + # libs. We are able to change OUTPUT_NAME to remove the _static + # for all other platforms. + if(NOT MSVC) + set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES + OUTPUT_NAME ${PNG_LIB_NAME} + CLEAN_DIRECT_OUTPUT 1) + endif() +endif() + +# If CMake > 2.4.x, we set a variable used below to export +# targets to an export file. +# TODO: Use VERSION_GREATER after our cmake_minimum_required >= 2.6.2 +if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 4) + set(PNG_EXPORT_RULE EXPORT libpng) +elseif(CMAKE_MAJOR_VERSION GREATER 2) # future proof + set(PNG_EXPORT_RULE EXPORT libpng) +endif() + +# INSTALL +if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) + install(TARGETS ${PNG_LIB_TARGETS} + ${PNG_EXPORT_RULE} + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(PNG_SHARED) + # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin + if(CYGWIN OR MINGW) + get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) + CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif(CYGWIN OR MINGW) + + if(NOT WIN32) + get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME} LOCATION_${CMAKE_BUILD_TYPE}) + CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_SHARED_LIBRARY_SUFFIX}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_SHARED_LIBRARY_SUFFIX} + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif(NOT WIN32) + endif(PNG_SHARED) + + if(PNG_STATIC) + if(NOT WIN32 OR CYGWIN OR MINGW) + get_target_property(BUILD_TARGET_LOCATION ${PNG_LIB_NAME_STATIC} LOCATION_${CMAKE_BUILD_TYPE}) + CREATE_SYMLINK(${BUILD_TARGET_LOCATION} libpng${CMAKE_STATIC_LIBRARY_SUFFIX}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${CMAKE_STATIC_LIBRARY_SUFFIX} + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif(NOT WIN32 OR CYGWIN OR MINGW) + endif() +endif() + +if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) + install(FILES ${libpng_public_hdrs} DESTINATION include) + install(FILES ${libpng_public_hdrs} DESTINATION include/${PNGLIB_NAME}) +endif() +if(NOT SKIP_INSTALL_EXECUTABLES AND NOT SKIP_INSTALL_ALL ) + if(NOT WIN32 OR CYGWIN OR MINGW) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config DESTINATION bin) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config + DESTINATION bin) + endif(NOT WIN32 OR CYGWIN OR MINGW) +endif() + +if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + # Install man pages + if(NOT PNG_MAN_DIR) + set(PNG_MAN_DIR "share/man") + endif() + install(FILES libpng.3 libpngpf.3 DESTINATION ${PNG_MAN_DIR}/man3) + install(FILES png.5 DESTINATION ${PNG_MAN_DIR}/man5) + # Install pkg-config files + if(NOT WIN32 OR CYGWIN OR MINGW) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libpng-config + DESTINATION bin) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${PNGLIB_NAME}-config + DESTINATION bin) + endif(NOT WIN32 OR CYGWIN OR MINGW) +endif() + +# On versions of CMake that support it, create an export file CMake +# users can include() to import our targets +if(PNG_EXPORT_RULE AND NOT SKIP_INSTALL_EXPORT AND NOT SKIP_INSTALL_ALL ) + install(EXPORT libpng DESTINATION lib/libpng FILE lib${PNG_LIB_NAME}.cmake) +endif() + +# what's with libpng-manual.txt and all the extra files? + +# UNINSTALL +# do we need this? + +# DIST +# do we need this? + +# to create msvc import lib for mingw compiled shared lib +# pexports libpng.dll > libpng.def +# lib /def:libpng.def /machine:x86 + diff --git a/External/lpng-1.6.17/build/UWP/LibPng.vcxproj b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj new file mode 100644 index 0000000..bf8e8ee --- /dev/null +++ b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj @@ -0,0 +1,212 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {fd9259e2-1645-46a7-aa26-3064fac7bbb5} + StaticLibrary + LibPng + 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 + ..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + ..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + ..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + ..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + ..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + false + ..\..\..\zlib-1.2.8;$(VC_IncludePath);$(WindowsSDK_IncludePath); + + + + false + true + PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + PNG_ABORT=abort;_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/lpng-1.6.17/build/UWP/LibPng.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Win32/LibPng-Debug.vgdbsettings b/External/lpng-1.6.17/build/Win32/LibPng-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/External/lpng-1.6.17/build/Win32/LibPng-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/External/lpng-1.6.17/build/Win32/LibPng-Release.vgdbsettings b/External/lpng-1.6.17/build/Win32/LibPng-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/External/lpng-1.6.17/build/Win32/LibPng-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/External/lpng-1.6.17/build/Win32/LibPng.vcxproj b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj new file mode 100644 index 0000000..bd1ec7b --- /dev/null +++ b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj @@ -0,0 +1,271 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + {822F4B60-069A-4F54-A219-DD4562A254A1} + Win32Proj + LibPng + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ..\..\..\zlib-1.2.8;$(IncludePath) + + + ..\..\..\zlib-1.2.8;$(IncludePath) + + + ..\..\..\zlib-1.2.8;$(IncludePath) + + + ..\..\..\zlib-1.2.8;$(IncludePath) + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Win32/LibPng.vcxproj.filters b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj.filters new file mode 100644 index 0000000..6a847dd --- /dev/null +++ b/External/lpng-1.6.17/build/Win32/LibPng.vcxproj.filters @@ -0,0 +1,66 @@ + + + + + {dac19598-28da-447b-bee9-07ce35461376} + + + {cd2e4cef-ae6e-4a0d-b30d-97041b2e00c8} + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + + + jni + + + jni + + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Win32/jni/Android.mk b/External/lpng-1.6.17/build/Win32/jni/Android.mk new file mode 100644 index 0000000..df2135c --- /dev/null +++ b/External/lpng-1.6.17/build/Win32/jni/Android.mk @@ -0,0 +1,22 @@ + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + +# Project configuration +LOCAL_MODULE := LibPng +# Force .c files to compile as c++ +LOCAL_CFLAGS := -DPLATFORM_ANDROID +LOCAL_CPP_FEATURES := +LOCAL_STATIC_LIBRARIES += + +# Include paths +PROJECT_ROOT := $(LOCAL_PATH)/../../../ +LOCAL_C_INCLUDES := $(PROJECT_ROOT) $(PROJECT_ROOT)/../zlib-1.2.8 + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../png.c ../../../pngerror.c ../../../pngget.c ../../../pngmem.c ../../../pngpread.c ../../../pngread.c ../../../pngrio.c ../../../pngrtran.c ../../../pngrutil.c ../../../pngset.c ../../../pngtrans.c ../../../pngwio.c ../../../pngwrite.c ../../../pngwtran.c ../../../pngwutil.c + +include $(BUILD_STATIC_LIBRARY) diff --git a/External/lpng-1.6.17/build/Win32/jni/Application.mk b/External/lpng-1.6.17/build/Win32/jni/Application.mk new file mode 100644 index 0000000..c4ead58 --- /dev/null +++ b/External/lpng-1.6.17/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 := LibPng \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems new file mode 100644 index 0000000..083556e --- /dev/null +++ b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems @@ -0,0 +1,49 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {8c6b12d1-7972-451f-a612-e7ac3443cb72} + LibPng + LibPng.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters new file mode 100644 index 0000000..0825b7e --- /dev/null +++ b/External/lpng-1.6.17/build/Windows.Shared/LibPng.Shared.vcxitems.filters @@ -0,0 +1,81 @@ + + + + + {8e647e23-9c6d-44c8-9527-3e071791bafb} + + + {5d91d619-2cdd-4ed7-9612-c13527904de5} + + + + + include + + + include + + + include + + + include + + + include + + + include + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows.Shared/LibPng.props b/External/lpng-1.6.17/build/Windows.Shared/LibPng.props new file mode 100644 index 0000000..a1303fa --- /dev/null +++ b/External/lpng-1.6.17/build/Windows.Shared/LibPng.props @@ -0,0 +1,13 @@ + + + + + + + + _CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + NotUsing + + + + \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows/LibPng-Debug.vgdbsettings b/External/lpng-1.6.17/build/Windows/LibPng-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/External/lpng-1.6.17/build/Windows/LibPng-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/External/lpng-1.6.17/build/Windows/LibPng-Release.vgdbsettings b/External/lpng-1.6.17/build/Windows/LibPng-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/External/lpng-1.6.17/build/Windows/LibPng-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/External/lpng-1.6.17/build/Windows/LibPng.props b/External/lpng-1.6.17/build/Windows/LibPng.props deleted file mode 100644 index a1303fa..0000000 --- a/External/lpng-1.6.17/build/Windows/LibPng.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - _CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - NotUsing - - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj b/External/lpng-1.6.17/build/Windows/LibPng.vcxproj deleted file mode 100644 index d501707..0000000 --- a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj +++ /dev/null @@ -1,271 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - {822F4B60-069A-4F54-A219-DD4562A254A1} - Win32Proj - LibPng - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ..\..\..\zlib-1.2.8;$(IncludePath) - - - ..\..\..\zlib-1.2.8;$(IncludePath) - - - ..\..\..\zlib-1.2.8;$(IncludePath) - - - ..\..\..\zlib-1.2.8;$(IncludePath) - - - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj.filters b/External/lpng-1.6.17/build/Windows/LibPng.vcxproj.filters deleted file mode 100644 index 6a847dd..0000000 --- a/External/lpng-1.6.17/build/Windows/LibPng.vcxproj.filters +++ /dev/null @@ -1,66 +0,0 @@ - - - - - {dac19598-28da-447b-bee9-07ce35461376} - - - {cd2e4cef-ae6e-4a0d-b30d-97041b2e00c8} - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - - - jni - - - jni - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/Windows/jni/Android.mk b/External/lpng-1.6.17/build/Windows/jni/Android.mk deleted file mode 100644 index df2135c..0000000 --- a/External/lpng-1.6.17/build/Windows/jni/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - -# Project configuration -LOCAL_MODULE := LibPng -# Force .c files to compile as c++ -LOCAL_CFLAGS := -DPLATFORM_ANDROID -LOCAL_CPP_FEATURES := -LOCAL_STATIC_LIBRARIES += - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../../ -LOCAL_C_INCLUDES := $(PROJECT_ROOT) $(PROJECT_ROOT)/../zlib-1.2.8 - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../png.c ../../../pngerror.c ../../../pngget.c ../../../pngmem.c ../../../pngpread.c ../../../pngread.c ../../../pngrio.c ../../../pngrtran.c ../../../pngrutil.c ../../../pngset.c ../../../pngtrans.c ../../../pngwio.c ../../../pngwrite.c ../../../pngwtran.c ../../../pngwutil.c - -include $(BUILD_STATIC_LIBRARY) diff --git a/External/lpng-1.6.17/build/Windows/jni/Application.mk b/External/lpng-1.6.17/build/Windows/jni/Application.mk deleted file mode 100644 index c4ead58..0000000 --- a/External/lpng-1.6.17/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 := LibPng \ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems b/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems deleted file mode 100644 index 30717f3..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems +++ /dev/null @@ -1,44 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {8c6b12d1-7972-451f-a612-e7ac3443cb72} - LibPng - LibPng.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters b/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters deleted file mode 100644 index 7022e9c..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Shared/LibPng.Shared.vcxitems.filters +++ /dev/null @@ -1,78 +0,0 @@ - - - - - {8e647e23-9c6d-44c8-9527-3e071791bafb} - - - {5d91d619-2cdd-4ed7-9612-c13527904de5} - - - - - include - - - include - - - include - - - include - - - include - - - include - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj b/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj deleted file mode 100644 index cc7d705..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {f6f756f0-2704-4cb8-b2b2-56f09d0e23e8} - LibPng - 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 - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters b/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.Windows/LibPng.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj b/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj deleted file mode 100644 index 0b76867..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {adf2ffd9-7dd1-49d7-b79c-f7c8f21efa3a} - LibPng - 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 - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - false - ..\..\..\..\zlib-1.2.8;$(IncludePath) - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - false - true - PNG_ABORT=abort;%(PreprocessorDefinitions) - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters b/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lpng-1.6.17/build/WindowsStore/LibPng.WindowsPhone/LibPng.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/lua-5.2.3/build/UWP/Lua.vcxproj b/External/lua-5.2.3/build/UWP/Lua.vcxproj new file mode 100644 index 0000000..5c2e3ad --- /dev/null +++ b/External/lua-5.2.3/build/UWP/Lua.vcxproj @@ -0,0 +1,214 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {25ec9b99-84dc-488b-b175-7888a6fda6a2} + StaticLibrary + Lua + 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 + NotUsing + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NotUsing + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NotUsing + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NotUsing + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + Console + false + false + + + + + false + true + NotUsing + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4334 + + + Console + false + false + + + + + false + true + NotUsing + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + 4334 + + + Console + false + false + + + + + + \ No newline at end of file diff --git a/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters b/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/lua-5.2.3/build/UWP/Lua.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings b/External/lua-5.2.3/build/Win32/Lua-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/External/lua-5.2.3/build/Win32/Lua-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/External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings b/External/lua-5.2.3/build/Win32/Lua-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/External/lua-5.2.3/build/Win32/Lua-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/External/lua-5.2.3/build/Win32/Lua.vcxproj b/External/lua-5.2.3/build/Win32/Lua.vcxproj new file mode 100644 index 0000000..50ce1b8 --- /dev/null +++ b/External/lua-5.2.3/build/Win32/Lua.vcxproj @@ -0,0 +1,372 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {3F7FED43-207A-4C2C-80C4-5965448D0706} + Lua + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(NMakeForcedIncludes) + + + $(NMakeForcedIncludes) + + + + Level3 + Disabled + true + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + CompileAsCpp + NotUsing + + + + true + + + + + Level3 + Disabled + true + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + CompileAsCpp + NotUsing + + 4100;4505;4334 + + + true + + + + + Level3 + MaxSpeed + true + true + true + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + CompileAsCpp + NotUsing + + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + CompileAsCpp + NotUsing + + 4100;4505;4334 + + + true + true + true + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + \ No newline at end of file diff --git a/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters b/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters new file mode 100644 index 0000000..7995534 --- /dev/null +++ b/External/lua-5.2.3/build/Win32/Lua.vcxproj.filters @@ -0,0 +1,117 @@ + + + + + {cdd5d0cf-717a-4018-b91a-cbdea1da694a} + + + {b6cf0680-4d1c-4dd9-af36-3435db6f02d7} + + + + + jni + + + jni + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + \ No newline at end of file diff --git a/External/lua-5.2.3/build/Win32/jni/Android.mk b/External/lua-5.2.3/build/Win32/jni/Android.mk new file mode 100644 index 0000000..e37ae2b --- /dev/null +++ b/External/lua-5.2.3/build/Win32/jni/Android.mk @@ -0,0 +1,21 @@ + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + +# Project configuration +LOCAL_MODULE := Lua +# Force .c files to compile as c++ +LOCAL_CFLAGS := -x c++ +LOCAL_CPP_FEATURES := +LOCAL_STATIC_LIBRARIES += + +# Include paths +LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../src + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../src/lapi.c ../../../src/lauxlib.c ../../../src/lbaselib.c ../../../src/lbitlib.c ../../../src/lcode.c ../../../src/lcorolib.c ../../../src/lctype.c ../../../src/ldblib.c ../../../src/ldebug.c ../../../src/ldo.c ../../../src/ldump.c ../../../src/lfunc.c ../../../src/lgc.c ../../../src/linit.c ../../../src/liolib.c ../../../src/llex.c ../../../src/lmathlib.c ../../../src/lmem.c ../../../src/loadlib.c ../../../src/lobject.c ../../../src/lopcodes.c ../../../src/loslib.c ../../../src/lparser.c ../../../src/lstate.c ../../../src/lstring.c ../../../src/lstrlib.c ../../../src/ltable.c ../../../src/ltablib.c ../../../src/ltm.c ../../../src/lundump.c ../../../src/lvm.c ../../../src/lzio.c + +include $(BUILD_STATIC_LIBRARY) diff --git a/External/lua-5.2.3/build/Win32/jni/Application.mk b/External/lua-5.2.3/build/Win32/jni/Application.mk new file mode 100644 index 0000000..40e89bb --- /dev/null +++ b/External/lua-5.2.3/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 := Lua \ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems new file mode 100644 index 0000000..893301e --- /dev/null +++ b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems @@ -0,0 +1,85 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {4703c34c-1a7f-4bb2-8ff8-007c55c015d5} + Lua + Lua.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + \ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters new file mode 100644 index 0000000..c637b23 --- /dev/null +++ b/External/lua-5.2.3/build/Windows.Shared/Lua.Shared.vcxitems.filters @@ -0,0 +1,189 @@ + + + + + {49cb749b-a0fb-4a8c-ae92-c64623bcc2ab} + + + {914d194a-480c-4f8d-a190-bd036d9622e9} + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + + \ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings b/External/lua-5.2.3/build/Windows/Lua-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/External/lua-5.2.3/build/Windows/Lua-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/External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings b/External/lua-5.2.3/build/Windows/Lua-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/External/lua-5.2.3/build/Windows/Lua-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/External/lua-5.2.3/build/Windows/Lua.vcxproj b/External/lua-5.2.3/build/Windows/Lua.vcxproj deleted file mode 100644 index 67ff315..0000000 --- a/External/lua-5.2.3/build/Windows/Lua.vcxproj +++ /dev/null @@ -1,370 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {3F7FED43-207A-4C2C-80C4-5965448D0706} - Lua - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(NMakeForcedIncludes) - - - $(NMakeForcedIncludes) - - - - Level3 - Disabled - true - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - CompileAsCpp - NotUsing - - - - true - - - - - Level3 - Disabled - true - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - CompileAsCpp - NotUsing - - - - true - - - - - Level3 - MaxSpeed - true - true - true - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - CompileAsCpp - NotUsing - - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - _UNICODE;UNICODE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - CompileAsCpp - NotUsing - - - - true - true - true - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - \ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters b/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters deleted file mode 100644 index 7995534..0000000 --- a/External/lua-5.2.3/build/Windows/Lua.vcxproj.filters +++ /dev/null @@ -1,117 +0,0 @@ - - - - - {cdd5d0cf-717a-4018-b91a-cbdea1da694a} - - - {b6cf0680-4d1c-4dd9-af36-3435db6f02d7} - - - - - jni - - - jni - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - \ No newline at end of file diff --git a/External/lua-5.2.3/build/Windows/jni/Android.mk b/External/lua-5.2.3/build/Windows/jni/Android.mk deleted file mode 100644 index e37ae2b..0000000 --- a/External/lua-5.2.3/build/Windows/jni/Android.mk +++ /dev/null @@ -1,21 +0,0 @@ - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - -# Project configuration -LOCAL_MODULE := Lua -# Force .c files to compile as c++ -LOCAL_CFLAGS := -x c++ -LOCAL_CPP_FEATURES := -LOCAL_STATIC_LIBRARIES += - -# Include paths -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../src - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/lapi.c ../../../src/lauxlib.c ../../../src/lbaselib.c ../../../src/lbitlib.c ../../../src/lcode.c ../../../src/lcorolib.c ../../../src/lctype.c ../../../src/ldblib.c ../../../src/ldebug.c ../../../src/ldo.c ../../../src/ldump.c ../../../src/lfunc.c ../../../src/lgc.c ../../../src/linit.c ../../../src/liolib.c ../../../src/llex.c ../../../src/lmathlib.c ../../../src/lmem.c ../../../src/loadlib.c ../../../src/lobject.c ../../../src/lopcodes.c ../../../src/loslib.c ../../../src/lparser.c ../../../src/lstate.c ../../../src/lstring.c ../../../src/lstrlib.c ../../../src/ltable.c ../../../src/ltablib.c ../../../src/ltm.c ../../../src/lundump.c ../../../src/lvm.c ../../../src/lzio.c - -include $(BUILD_STATIC_LIBRARY) diff --git a/External/lua-5.2.3/build/Windows/jni/Application.mk b/External/lua-5.2.3/build/Windows/jni/Application.mk deleted file mode 100644 index 40e89bb..0000000 --- a/External/lua-5.2.3/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 := Lua \ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems b/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems deleted file mode 100644 index fba2720..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems +++ /dev/null @@ -1,80 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {4703c34c-1a7f-4bb2-8ff8-007c55c015d5} - Lua - Lua.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters b/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters deleted file mode 100644 index 27d88a9..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Shared/Lua.Shared.vcxitems.filters +++ /dev/null @@ -1,186 +0,0 @@ - - - - - {49cb749b-a0fb-4a8c-ae92-c64623bcc2ab} - - - {914d194a-480c-4f8d-a190-bd036d9622e9} - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - \ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj b/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj deleted file mode 100644 index a88c87e..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {5110a62b-172f-48fe-a268-4931577d9aad} - Lua - 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 - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters b/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.Windows/Lua.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj b/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj deleted file mode 100644 index ec044d3..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {6536c1f5-4ea4-49a3-92f1-810c4750bf10} - Lua - 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 - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - NotUsing - false - true - _WINDOWS_APP;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - CompileAsCpp - - - Console - false - false - - - - - - \ No newline at end of file diff --git a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters b/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/lua-5.2.3/build/WindowsStore/Lua.WindowsPhone/Lua.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/lua-5.2.3/src/luaconf.h b/External/lua-5.2.3/src/luaconf.h index 73bac22..19989bf 100644 --- a/External/lua-5.2.3/src/luaconf.h +++ b/External/lua-5.2.3/src/luaconf.h @@ -549,7 +549,7 @@ # define getlocaledecpoint() '.' #endif -#ifdef _WINDOWS_STORE +#ifdef PLATFORM_UNIVERSAL_WINDOWS # include "winappstubs.h" #endif diff --git a/External/zlib-1.2.8/CMakeLists.txt b/External/zlib-1.2.8/CMakeLists.txt deleted file mode 100644 index 0c0247c..0000000 --- a/External/zlib-1.2.8/CMakeLists.txt +++ /dev/null @@ -1,249 +0,0 @@ -cmake_minimum_required(VERSION 2.4.4) -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) - -project(zlib C) - -set(VERSION "1.2.8") - -option(ASM686 "Enable building i686 assembly implementation") -option(AMD64 "Enable building amd64 assembly implementation") - -set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") -set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") -set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") -set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") -set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") - -include(CheckTypeSize) -include(CheckFunctionExists) -include(CheckIncludeFile) -include(CheckCSourceCompiles) -enable_testing() - -check_include_file(sys/types.h HAVE_SYS_TYPES_H) -check_include_file(stdint.h HAVE_STDINT_H) -check_include_file(stddef.h HAVE_STDDEF_H) - -# -# Check to see if we have large file support -# -set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1) -# We add these other definitions here because CheckTypeSize.cmake -# in CMake 2.4.x does not automatically do so and we want -# compatibility with CMake 2.4.x. -if(HAVE_SYS_TYPES_H) - list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H) -endif() -if(HAVE_STDINT_H) - list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H) -endif() -if(HAVE_STDDEF_H) - list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H) -endif() -check_type_size(off64_t OFF64_T) -if(HAVE_OFF64_T) - add_definitions(-D_LARGEFILE64_SOURCE=1) -endif() -set(CMAKE_REQUIRED_DEFINITIONS) # clear variable - -# -# Check for fseeko -# -check_function_exists(fseeko HAVE_FSEEKO) -if(NOT HAVE_FSEEKO) - add_definitions(-DNO_FSEEKO) -endif() - -# -# Check for unistd.h -# -check_include_file(unistd.h Z_HAVE_UNISTD_H) - -if(MSVC) - set(CMAKE_DEBUG_POSTFIX "d") - add_definitions(-D_CRT_SECURE_NO_DEPRECATE) - add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -endif() - -if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) - # If we're doing an out of source build and the user has a zconf.h - # in their source tree... - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) - message(STATUS "Renaming") - message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h") - message(STATUS "to 'zconf.h.included' because this file is included with zlib") - message(STATUS "but CMake generates it automatically in the build directory.") - file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included) - endif() -endif() - -set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein - ${ZLIB_PC} @ONLY) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein - ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) - - -#============================================================================ -# zlib -#============================================================================ - -set(ZLIB_PUBLIC_HDRS - ${CMAKE_CURRENT_BINARY_DIR}/zconf.h - zlib.h -) -set(ZLIB_PRIVATE_HDRS - crc32.h - deflate.h - gzguts.h - inffast.h - inffixed.h - inflate.h - inftrees.h - trees.h - zutil.h -) -set(ZLIB_SRCS - adler32.c - compress.c - crc32.c - deflate.c - gzclose.c - gzlib.c - gzread.c - gzwrite.c - inflate.c - infback.c - inftrees.c - inffast.c - trees.c - uncompr.c - zutil.c -) - -if(NOT MINGW) - set(ZLIB_DLL_SRCS - win32/zlib1.rc # If present will override custom build rule below. - ) -endif() - -if(CMAKE_COMPILER_IS_GNUCC) - if(ASM686) - set(ZLIB_ASMS contrib/asm686/match.S) - elseif (AMD64) - set(ZLIB_ASMS contrib/amd64/amd64-match.S) - endif () - - if(ZLIB_ASMS) - add_definitions(-DASMV) - set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE) - endif() -endif() - -if(MSVC) - if(ASM686) - ENABLE_LANGUAGE(ASM_MASM) - set(ZLIB_ASMS - contrib/masmx86/inffas32.asm - contrib/masmx86/match686.asm - ) - elseif (AMD64) - ENABLE_LANGUAGE(ASM_MASM) - set(ZLIB_ASMS - contrib/masmx64/gvmat64.asm - contrib/masmx64/inffasx64.asm - ) - endif() - - if(ZLIB_ASMS) - add_definitions(-DASMV -DASMINF) - endif() -endif() - -# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION -file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) -string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" - "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) - -if(MINGW) - # This gets us DLL resource information when compiling on MinGW. - if(NOT CMAKE_RC_COMPILER) - set(CMAKE_RC_COMPILER windres.exe) - endif() - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj - COMMAND ${CMAKE_RC_COMPILER} - -D GCC_WINDRES - -I ${CMAKE_CURRENT_SOURCE_DIR} - -I ${CMAKE_CURRENT_BINARY_DIR} - -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj - -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) - set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) -endif(MINGW) - -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) -set_target_properties(zlib PROPERTIES SOVERSION 1) - -if(NOT CYGWIN) - # This property causes shared libraries on Linux to have the full version - # encoded into their final filename. We disable this on Cygwin because - # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll - # seems to be the default. - # - # This has no effect with MSVC, on that platform the version info for - # the DLL comes from the resource file win32/zlib1.rc - set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) -endif() - -if(UNIX) - # On unix-like platforms the library is almost always called libz - set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) - if(NOT APPLE) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") - endif() -elseif(BUILD_SHARED_LIBS AND WIN32) - # Creates zlib1.dll when building shared library version - set_target_properties(zlib PROPERTIES SUFFIX "1.dll") -endif() - -if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) - install(TARGETS zlib zlibstatic - RUNTIME DESTINATION "${INSTALL_BIN_DIR}" - ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" - LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) -endif() -if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) - install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}") -endif() -if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) - install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") -endif() -if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) - install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") -endif() - -#============================================================================ -# Example binaries -#============================================================================ - -add_executable(example test/example.c) -target_link_libraries(example zlib) -add_test(example example) - -add_executable(minigzip test/minigzip.c) -target_link_libraries(minigzip zlib) - -if(HAVE_OFF64_T) - add_executable(example64 test/example.c) - target_link_libraries(example64 zlib) - set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") - add_test(example64 example64) - - add_executable(minigzip64 test/minigzip.c) - target_link_libraries(minigzip64 zlib) - set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") -endif() diff --git a/External/zlib-1.2.8/CMakeLists.~txt b/External/zlib-1.2.8/CMakeLists.~txt new file mode 100644 index 0000000..d5c5942 --- /dev/null +++ b/External/zlib-1.2.8/CMakeLists.~txt @@ -0,0 +1,254 @@ +cmake_minimum_required(VERSION 2.4.4) +set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) + +project(zlib C) + +set(VERSION "1.2.8") + +option(ASM686 "Enable building i686 assembly implementation") +option(AMD64 "Enable building amd64 assembly implementation") + +set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") +set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") +set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") +set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") +set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") + +include(CheckTypeSize) +include(CheckFunctionExists) +include(CheckIncludeFile) +include(CheckCSourceCompiles) +enable_testing() + +check_include_file(sys/types.h HAVE_SYS_TYPES_H) +check_include_file(stdint.h HAVE_STDINT_H) +check_include_file(stddef.h HAVE_STDDEF_H) + +# +# Check to see if we have large file support +# +set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1) +# We add these other definitions here because CheckTypeSize.cmake +# in CMake 2.4.x does not automatically do so and we want +# compatibility with CMake 2.4.x. +if(HAVE_SYS_TYPES_H) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H) +endif() +if(HAVE_STDINT_H) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H) +endif() +if(HAVE_STDDEF_H) + list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H) +endif() +check_type_size(off64_t OFF64_T) +if(HAVE_OFF64_T) + add_definitions(-D_LARGEFILE64_SOURCE=1) +endif() +set(CMAKE_REQUIRED_DEFINITIONS) # clear variable + +# +# Check for fseeko +# +check_function_exists(fseeko HAVE_FSEEKO) +if(NOT HAVE_FSEEKO) + add_definitions(-DNO_FSEEKO) +endif() + +# +# Check for unistd.h +# +check_include_file(unistd.h Z_HAVE_UNISTD_H) + +if(MSVC) + set(CMAKE_DEBUG_POSTFIX "d") + add_definitions(-D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +endif() + +if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) + # If we're doing an out of source build and the user has a zconf.h + # in their source tree... + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) + message(STATUS "Renaming") + message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h") + message(STATUS "to 'zconf.h.included' because this file is included with zlib") + message(STATUS "but CMake generates it automatically in the build directory.") + file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included) + endif() +endif() + +set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein + ${ZLIB_PC} @ONLY) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein + ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) + + +#============================================================================ +# zlib +#============================================================================ + +set(ZLIB_PUBLIC_HDRS + ${CMAKE_CURRENT_BINARY_DIR}/zconf.h + zlib.h +) +set(ZLIB_PRIVATE_HDRS + crc32.h + deflate.h + gzguts.h + inffast.h + inffixed.h + inflate.h + inftrees.h + trees.h + zutil.h +) +set(ZLIB_SRCS + adler32.c + compress.c + crc32.c + deflate.c + gzclose.c + gzlib.c + gzread.c + gzwrite.c + inflate.c + infback.c + inftrees.c + inffast.c + trees.c + uncompr.c + zutil.c +) + +if(NOT MINGW) + set(ZLIB_DLL_SRCS + win32/zlib1.rc # If present will override custom build rule below. + ) +endif() + +if(CMAKE_COMPILER_IS_GNUCC) + if(ASM686) + set(ZLIB_ASMS contrib/asm686/match.S) + elseif (AMD64) + set(ZLIB_ASMS contrib/amd64/amd64-match.S) + endif () + + if(ZLIB_ASMS) + add_definitions(-DASMV) + set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE) + endif() +endif() + +if(MSVC) + if(ASM686) + ENABLE_LANGUAGE(ASM_MASM) + set(ZLIB_ASMS + contrib/masmx86/inffas32.asm + contrib/masmx86/match686.asm + ) + elseif (AMD64) + ENABLE_LANGUAGE(ASM_MASM) + set(ZLIB_ASMS + contrib/masmx64/gvmat64.asm + contrib/masmx64/inffasx64.asm + ) + endif() + + if(ZLIB_ASMS) + add_definitions(-DASMV -DASMINF) + endif() +endif() + +# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) +string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +if(MINGW) + # This gets us DLL resource information when compiling on MinGW. + if(NOT CMAKE_RC_COMPILER) + set(CMAKE_RC_COMPILER windres.exe) + endif() + + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + COMMAND ${CMAKE_RC_COMPILER} + -D GCC_WINDRES + -I ${CMAKE_CURRENT_SOURCE_DIR} + -I ${CMAKE_CURRENT_BINARY_DIR} + -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj + -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) +endif(MINGW) + +add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + + + return() # Delete this line to generate dynamic library and example binaries + + +add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) +set_target_properties(zlib PROPERTIES SOVERSION 1) + +if(NOT CYGWIN) + # This property causes shared libraries on Linux to have the full version + # encoded into their final filename. We disable this on Cygwin because + # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll + # seems to be the default. + # + # This has no effect with MSVC, on that platform the version info for + # the DLL comes from the resource file win32/zlib1.rc + set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) +endif() + +if(UNIX) + # On unix-like platforms the library is almost always called libz + set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() +elseif(BUILD_SHARED_LIBS AND WIN32) + # Creates zlib1.dll when building shared library version + set_target_properties(zlib PROPERTIES SUFFIX "1.dll") +endif() + +if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) + install(TARGETS zlib zlibstatic + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) +endif() +if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}") +endif() +if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") +endif() +if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") +endif() + +#============================================================================ +# Example binaries +#============================================================================ + +add_executable(example test/example.c) +target_link_libraries(example zlib) +add_test(example example) + +add_executable(minigzip test/minigzip.c) +target_link_libraries(minigzip zlib) + +if(HAVE_OFF64_T) + add_executable(example64 test/example.c) + target_link_libraries(example64 zlib) + set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") + add_test(example64 example64) + + add_executable(minigzip64 test/minigzip.c) + target_link_libraries(minigzip64 zlib) + set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +endif() diff --git a/External/zlib-1.2.8/build/UWP/zlib.vcxproj b/External/zlib-1.2.8/build/UWP/zlib.vcxproj new file mode 100644 index 0000000..e54bfc7 --- /dev/null +++ b/External/zlib-1.2.8/build/UWP/zlib.vcxproj @@ -0,0 +1,200 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {e1220c25-285f-4d0f-a2b3-3871a37cd904} + StaticLibrary + zlib + 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/External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters b/External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/External/zlib-1.2.8/build/UWP/zlib.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Win32/jni/Android.mk b/External/zlib-1.2.8/build/Win32/jni/Android.mk new file mode 100644 index 0000000..04b9911 --- /dev/null +++ b/External/zlib-1.2.8/build/Win32/jni/Android.mk @@ -0,0 +1,22 @@ + +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + +# Project configuration +LOCAL_MODULE := zlib +# Force .c files to compile as c++ +LOCAL_CFLAGS := -DPLATFORM_ANDROID +LOCAL_CPP_FEATURES := +LOCAL_STATIC_LIBRARIES += + +# Include paths +PROJECT_ROOT := $(LOCAL_PATH)/../../../ +LOCAL_C_INCLUDES := $(PROJECT_ROOT) + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../adler32.c ../../../compress.c ../../../crc32.c ../../../deflate.c ../../../gzclose.c ../../../gzlib.c ../../../gzread.c ../../../gzwrite.c ../../../infback.c ../../../inffast.c ../../../inflate.c ../../../inftrees.c ../../../trees.c ../../../uncompr.c ../../../zutil.c + +include $(BUILD_STATIC_LIBRARY) diff --git a/External/zlib-1.2.8/build/Win32/jni/Application.mk b/External/zlib-1.2.8/build/Win32/jni/Application.mk new file mode 100644 index 0000000..2bd7481 --- /dev/null +++ b/External/zlib-1.2.8/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 := zlib \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Win32/zlib-Debug.vgdbsettings b/External/zlib-1.2.8/build/Win32/zlib-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/External/zlib-1.2.8/build/Win32/zlib-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/External/zlib-1.2.8/build/Win32/zlib-Release.vgdbsettings b/External/zlib-1.2.8/build/Win32/zlib-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/External/zlib-1.2.8/build/Win32/zlib-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/External/zlib-1.2.8/build/Win32/zlib.vcxproj b/External/zlib-1.2.8/build/Win32/zlib.vcxproj new file mode 100644 index 0000000..125ee06 --- /dev/null +++ b/External/zlib-1.2.8/build/Win32/zlib.vcxproj @@ -0,0 +1,264 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + {695C52B1-0267-4DED-BDF3-E7113756FF3F} + Win32Proj + zlib + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + 4996 + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + 4996 + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;%(PreprocessorDefinitions) + 4996 + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;%(PreprocessorDefinitions) + 4996 + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Win32/zlib.vcxproj.filters b/External/zlib-1.2.8/build/Win32/zlib.vcxproj.filters new file mode 100644 index 0000000..6eacac7 --- /dev/null +++ b/External/zlib-1.2.8/build/Win32/zlib.vcxproj.filters @@ -0,0 +1,67 @@ + + + + + {01669057-2195-413f-b3da-606ac178f154} + + + {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 + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + + + jni + + + jni + + + \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems new file mode 100644 index 0000000..ec43deb --- /dev/null +++ b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems @@ -0,0 +1,54 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {40ccced6-03e5-4ca9-a235-990c055dfe70} + zlib + zlib.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters new file mode 100644 index 0000000..3a90790 --- /dev/null +++ b/External/zlib-1.2.8/build/Windows.Shared/zlib.Shared.vcxitems.filters @@ -0,0 +1,96 @@ + + + + + {ca411b76-03a7-4e29-baae-972b8df0d995} + + + {2177d97c-edf5-4a22-bcdb-f06854beceef} + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + + \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows.Shared/zlib.props b/External/zlib-1.2.8/build/Windows.Shared/zlib.props new file mode 100644 index 0000000..a1303fa --- /dev/null +++ b/External/zlib-1.2.8/build/Windows.Shared/zlib.props @@ -0,0 +1,13 @@ + + + + + + + + _CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) + NotUsing + + + + \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows/jni/Android.mk b/External/zlib-1.2.8/build/Windows/jni/Android.mk deleted file mode 100644 index 04b9911..0000000 --- a/External/zlib-1.2.8/build/Windows/jni/Android.mk +++ /dev/null @@ -1,22 +0,0 @@ - -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - -# Project configuration -LOCAL_MODULE := zlib -# Force .c files to compile as c++ -LOCAL_CFLAGS := -DPLATFORM_ANDROID -LOCAL_CPP_FEATURES := -LOCAL_STATIC_LIBRARIES += - -# Include paths -PROJECT_ROOT := $(LOCAL_PATH)/../../../ -LOCAL_C_INCLUDES := $(PROJECT_ROOT) - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../adler32.c ../../../compress.c ../../../crc32.c ../../../deflate.c ../../../gzclose.c ../../../gzlib.c ../../../gzread.c ../../../gzwrite.c ../../../infback.c ../../../inffast.c ../../../inflate.c ../../../inftrees.c ../../../trees.c ../../../uncompr.c ../../../zutil.c - -include $(BUILD_STATIC_LIBRARY) diff --git a/External/zlib-1.2.8/build/Windows/jni/Application.mk b/External/zlib-1.2.8/build/Windows/jni/Application.mk deleted file mode 100644 index 2bd7481..0000000 --- a/External/zlib-1.2.8/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 := zlib \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows/zlib-Debug.vgdbsettings b/External/zlib-1.2.8/build/Windows/zlib-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/External/zlib-1.2.8/build/Windows/zlib-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/External/zlib-1.2.8/build/Windows/zlib-Release.vgdbsettings b/External/zlib-1.2.8/build/Windows/zlib-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/External/zlib-1.2.8/build/Windows/zlib-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/External/zlib-1.2.8/build/Windows/zlib.props b/External/zlib-1.2.8/build/Windows/zlib.props deleted file mode 100644 index a1303fa..0000000 --- a/External/zlib-1.2.8/build/Windows/zlib.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - _CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions) - NotUsing - - - - \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows/zlib.vcxproj b/External/zlib-1.2.8/build/Windows/zlib.vcxproj deleted file mode 100644 index f66fcbd..0000000 --- a/External/zlib-1.2.8/build/Windows/zlib.vcxproj +++ /dev/null @@ -1,264 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - {695C52B1-0267-4DED-BDF3-E7113756FF3F} - Win32Proj - zlib - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - 4996 - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) - 4996 - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;%(PreprocessorDefinitions) - 4996 - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;%(PreprocessorDefinitions) - 4996 - - - Windows - true - true - true - - - - - - \ No newline at end of file diff --git a/External/zlib-1.2.8/build/Windows/zlib.vcxproj.filters b/External/zlib-1.2.8/build/Windows/zlib.vcxproj.filters deleted file mode 100644 index 6eacac7..0000000 --- a/External/zlib-1.2.8/build/Windows/zlib.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - {01669057-2195-413f-b3da-606ac178f154} - - - {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 - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - - - jni - - - jni - - - \ No newline at end of file diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems b/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems deleted file mode 100644 index 218df4a..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems +++ /dev/null @@ -1,49 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {40ccced6-03e5-4ca9-a235-990c055dfe70} - zlib - zlib.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters b/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters deleted file mode 100644 index faf7f31..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Shared/zlib.Shared.vcxitems.filters +++ /dev/null @@ -1,93 +0,0 @@ - - - - - {ca411b76-03a7-4e29-baae-972b8df0d995} - - - {2177d97c-edf5-4a22-bcdb-f06854beceef} - - - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj b/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj deleted file mode 100644 index 1f487b1..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj +++ /dev/null @@ -1,193 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {e9b3069f-ca6c-4c5c-91b6-df112c5b290e} - zlib - 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 - - - - 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/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters b/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.Windows/zlib.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj b/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj deleted file mode 100644 index 6065a19..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj +++ /dev/null @@ -1,136 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {faa06bfc-3248-4338-97c4-7a1ca6db7c9c} - zlib - 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 - - - - 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/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters b/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/External/zlib-1.2.8/build/WindowsStore/zlib.WindowsPhone/zlib.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/RenderScript/build/UWP/RenderScript.vcxproj b/RenderScript/build/UWP/RenderScript.vcxproj new file mode 100644 index 0000000..6cc4c9d --- /dev/null +++ b/RenderScript/build/UWP/RenderScript.vcxproj @@ -0,0 +1,200 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {6295c316-2ca6-4512-ae9b-f5f70dbd6d33} + StaticLibrary + RenderScript + 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/RenderScript/build/UWP/RenderScript.vcxproj.filters b/RenderScript/build/UWP/RenderScript.vcxproj.filters new file mode 100644 index 0000000..c31757e --- /dev/null +++ b/RenderScript/build/UWP/RenderScript.vcxproj.filters @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/RenderScript/build/Win32/RenderScript-Debug.vgdbsettings b/RenderScript/build/Win32/RenderScript-Debug.vgdbsettings new file mode 100644 index 0000000..3f5b24b --- /dev/null +++ b/RenderScript/build/Win32/RenderScript-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/RenderScript/build/Win32/RenderScript-Release.vgdbsettings b/RenderScript/build/Win32/RenderScript-Release.vgdbsettings new file mode 100644 index 0000000..669691f --- /dev/null +++ b/RenderScript/build/Win32/RenderScript-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/RenderScript/build/Win32/RenderScript.vcxproj b/RenderScript/build/Win32/RenderScript.vcxproj new file mode 100644 index 0000000..403dd93 --- /dev/null +++ b/RenderScript/build/Win32/RenderScript.vcxproj @@ -0,0 +1,316 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {C8ADD3B4-E83B-458E-96C8-B278F22C2F04} + RenderScript + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + v120 + Makefile + + + v120 + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes) + + + $(ProjectDir)..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes) + + + + Level3 + Disabled + true + + + true + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + \ No newline at end of file diff --git a/RenderScript/build/Win32/RenderScript.vcxproj.filters b/RenderScript/build/Win32/RenderScript.vcxproj.filters new file mode 100644 index 0000000..fda009a --- /dev/null +++ b/RenderScript/build/Win32/RenderScript.vcxproj.filters @@ -0,0 +1,96 @@ + + + + + {7b27af1c-c100-4b86-8a4d-3ca9de633b95} + + + {2d07eaf6-da74-46a3-87bb-44b0c7ce24e6} + + + + + jni + + + jni + + + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + android_src + + + \ No newline at end of file diff --git a/RenderScript/build/Win32/jni/Android.mk b/RenderScript/build/Win32/jni/Android.mk new file mode 100644 index 0000000..d968fcc --- /dev/null +++ b/RenderScript/build/Win32/jni/Android.mk @@ -0,0 +1,31 @@ +# Preamble +DEPENDENCY_PATH := $(call my-dir) +LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) +include $(CLEAR_VARS) + + +# Project configuration +LOCAL_MODULE := RenderScript +LOCAL_CFLAGS := -std=c++11 -Wno-invalid-offsetof +LOCAL_CPP_FEATURES := exceptions rtti +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 += $(GRAPHICS_ROOT)/GraphicsEngine/interface +LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include +LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface +LOCAL_C_INCLUDES += $(REPO_ROOT)/External/lua-5.2.3/src +LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsTools/include +LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface + +# Source files +#VisualGDBAndroid: AutoUpdateSourcesInNextLine +LOCAL_SRC_FILES := ../../../src/BlendStateDescParser.cpp ../../../src/BufferParser.cpp ../../../src/BufferViewParser.cpp ../../../src/DepthStencilStateDescParser.cpp ../../../src/DeviceContextFuncBindings.cpp ../../../src/DrawAttribsParser.cpp ../../../src/EngineObjectParserBase.cpp ../../../src/EnumMappings.cpp ../../../src/InputLayoutDescParser.cpp ../../../src/LuaBindings.cpp ../../../src/LuaFunctionBinding.cpp ../../../src/LuaWrappers.cpp ../../../src/ParsingErrors.cpp ../../../src/PSODescParser.cpp ../../../src/RasterizerStateDescParser.cpp ../../../src/ResourceMappingParser.cpp ../../../src/SamplerParser.cpp ../../../src/ScissorRectParser.cpp ../../../src/ScriptParser.cpp ../../../src/ShaderParser.cpp ../../../src/ShaderResourceBindingParser.cpp ../../../src/ShaderVariableParser.cpp ../../../src/TextureParser.cpp ../../../src/TextureViewParser.cpp ../../../src/ViewportParser.cpp + +include $(BUILD_STATIC_LIBRARY) diff --git a/RenderScript/build/Win32/jni/Application.mk b/RenderScript/build/Win32/jni/Application.mk new file mode 100644 index 0000000..1c80ded --- /dev/null +++ b/RenderScript/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 := RenderScript \ No newline at end of file diff --git a/RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems b/RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems new file mode 100644 index 0000000..97ee3ba --- /dev/null +++ b/RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems @@ -0,0 +1,86 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {ac843cd8-70c4-4bf9-bbfb-bb8e5979f81e} + RenderScript + RenderScript.Shared + 248F659F-DAC5-46E8-AC09-60EC9FC95053 + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + false + + + \ No newline at end of file diff --git a/RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems.filters b/RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems.filters new file mode 100644 index 0000000..cd3aa41 --- /dev/null +++ b/RenderScript/build/Windows.Shared/RenderScript.Shared.vcxitems.filters @@ -0,0 +1,186 @@ + + + + + {69ff86a9-0ff4-402f-817b-e18bb6685329} + + + {6e3f6948-d5fa-4225-b192-0354c9935989} + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + + \ No newline at end of file diff --git a/RenderScript/build/Windows.Shared/RenderScript.props b/RenderScript/build/Windows.Shared/RenderScript.props new file mode 100644 index 0000000..844625f --- /dev/null +++ b/RenderScript/build/Windows.Shared/RenderScript.props @@ -0,0 +1,32 @@ + + + + + ..\.. + ..\..\.. + ..\..\..\.. + $(EngineRoot)\diligentcore + $(CoreRoot)\Graphics + + + $(ProjectRoot)\include;$(CoreRoot)\Common\include;$(CoreRoot)\Common\interface;$(GraphicsRoot)\GraphicsEngine\interface;$(ToolsRoot)\External\lua-5.2.3\src;$(CoreRoot)\Platforms\interface;$(GraphicsRoot)\GraphicsTools\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) + + + + + $(ProjectRoot) + + + $(ToolsRoot) + + + $(EngineRoot) + + + $(CoreRoot) + + + $(GraphicsRoot) + + + \ No newline at end of file diff --git a/RenderScript/build/Windows/EngineRoot.props b/RenderScript/build/Windows/EngineRoot.props deleted file mode 100644 index 92b5517..0000000 --- a/RenderScript/build/Windows/EngineRoot.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - ..\.. - ..\..\.. - ..\..\..\.. - $(EngineRoot)\diligentcore - $(CoreRoot)\Graphics - - - - - - $(ProjectRoot) - - - $(ToolsRoot) - - - $(EngineRoot) - - - $(CoreRoot) - - - $(GraphicsRoot) - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/RenderScript-Debug.vgdbsettings b/RenderScript/build/Windows/RenderScript-Debug.vgdbsettings deleted file mode 100644 index 3f5b24b..0000000 --- a/RenderScript/build/Windows/RenderScript-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/RenderScript/build/Windows/RenderScript-Release.vgdbsettings b/RenderScript/build/Windows/RenderScript-Release.vgdbsettings deleted file mode 100644 index 669691f..0000000 --- a/RenderScript/build/Windows/RenderScript-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/RenderScript/build/Windows/RenderScript.props b/RenderScript/build/Windows/RenderScript.props deleted file mode 100644 index 8dd0ca6..0000000 --- a/RenderScript/build/Windows/RenderScript.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - $(ProjectRoot)\include;$(CoreRoot)\Common\include;$(CoreRoot)\Common\interface;$(GraphicsRoot)\GraphicsEngine\interface;$(ToolsRoot)\External\lua-5.2.3\src;$(CoreRoot)\Platforms\interface;$(GraphicsRoot)\GraphicsTools\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) - - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/RenderScript.vcxproj b/RenderScript/build/Windows/RenderScript.vcxproj deleted file mode 100644 index 3ea8d8e..0000000 --- a/RenderScript/build/Windows/RenderScript.vcxproj +++ /dev/null @@ -1,308 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04} - RenderScript - - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - v120 - Makefile - - - v120 - Makefile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(ProjectDir)..\..\..\Common\Android\gcc_Debug.h;$(NMakeForcedIncludes) - - - $(ProjectDir)..\..\..\Common\Android\gcc_Release.h;$(NMakeForcedIncludes) - - - - Level3 - Disabled - true - - - true - - - - - Level3 - Disabled - true - - - true - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - Level3 - MaxSpeed - true - true - true - - - true - true - true - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/RenderScript.vcxproj.filters b/RenderScript/build/Windows/RenderScript.vcxproj.filters deleted file mode 100644 index 4ef09d5..0000000 --- a/RenderScript/build/Windows/RenderScript.vcxproj.filters +++ /dev/null @@ -1,90 +0,0 @@ - - - - - {7b27af1c-c100-4b86-8a4d-3ca9de633b95} - - - {2d07eaf6-da74-46a3-87bb-44b0c7ce24e6} - - - - - jni - - - jni - - - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - android_src - - - \ No newline at end of file diff --git a/RenderScript/build/Windows/jni/Android.mk b/RenderScript/build/Windows/jni/Android.mk deleted file mode 100644 index d629a4f..0000000 --- a/RenderScript/build/Windows/jni/Android.mk +++ /dev/null @@ -1,31 +0,0 @@ -# Preamble -DEPENDENCY_PATH := $(call my-dir) -LOCAL_PATH := $(abspath $(DEPENDENCY_PATH)) -include $(CLEAR_VARS) - - -# Project configuration -LOCAL_MODULE := RenderScript -LOCAL_CFLAGS := -std=c++11 -Wno-invalid-offsetof -LOCAL_CPP_FEATURES := exceptions rtti -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 += $(GRAPHICS_ROOT)/GraphicsEngine/interface -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Common/interface -LOCAL_C_INCLUDES += $(REPO_ROOT)/External/lua-5.2.3/src -LOCAL_C_INCLUDES += $(GRAPHICS_ROOT)/GraphicsTools/include -LOCAL_C_INCLUDES += $(CORE_ROOT)/Platforms/interface - -# Source files -#VisualGDBAndroid: AutoUpdateSourcesInNextLine -LOCAL_SRC_FILES := ../../../src/BlendStateParser.cpp ../../../src/BufferParser.cpp ../../../src/BufferViewParser.cpp ../../../src/DepthStencilStateParser.cpp ../../../src/DeviceContextFuncBindings.cpp ../../../src/DrawAttribsParser.cpp ../../../src/EngineObjectParserBase.cpp ../../../src/EnumMappings.cpp ../../../src/LayoutDescParser.cpp ../../../src/LuaBindings.cpp ../../../src/LuaFunctionBinding.cpp ../../../src/LuaWrappers.cpp ../../../src/ParsingErrors.cpp ../../../src/RasterizerStateParser.cpp ../../../src/ResourceMappingParser.cpp ../../../src/SamplerParser.cpp ../../../src/ScissorRectParser.cpp ../../../src/ScriptParser.cpp ../../../src/ShaderParser.cpp ../../../src/ShaderVariableParser.cpp ../../../src/TextureParser.cpp ../../../src/TextureViewParser.cpp ../../../src/ViewportParser.cpp - -include $(BUILD_STATIC_LIBRARY) diff --git a/RenderScript/build/Windows/jni/Application.mk b/RenderScript/build/Windows/jni/Application.mk deleted file mode 100644 index 1c80ded..0000000 --- a/RenderScript/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 := RenderScript \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/EngineRoot.props b/RenderScript/build/WindowsStore/EngineRoot.props deleted file mode 100644 index 79dc389..0000000 --- a/RenderScript/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/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems b/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems deleted file mode 100644 index cb66637..0000000 --- a/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems +++ /dev/null @@ -1,77 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - true - {ac843cd8-70c4-4bf9-bbfb-bb8e5979f81e} - RenderScript - RenderScript.Shared - 248F659F-DAC5-46E8-AC09-60EC9FC95053 - - - - %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters b/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters deleted file mode 100644 index a82a379..0000000 --- a/RenderScript/build/WindowsStore/RenderScript.Shared/RenderScript.Shared.vcxitems.filters +++ /dev/null @@ -1,171 +0,0 @@ - - - - - {69ff86a9-0ff4-402f-817b-e18bb6685329} - - - {6e3f6948-d5fa-4225-b192-0354c9935989} - - - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - include - - - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - src - - - \ No newline at end of file diff --git a/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj b/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj deleted file mode 100644 index 250c7b6..0000000 --- a/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM - - - Release - Win32 - - - Release - x64 - - - - {1911bc2f-d78f-49c7-8847-b10b333da85a} - RenderScript - 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/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters b/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/RenderScript/build/WindowsStore/RenderScript.Windows/RenderScript.Windows.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj b/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj deleted file mode 100644 index 1bb30a3..0000000 --- a/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - - {c6d20522-f184-47e4-afa0-31341a71495f} - RenderScript - 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/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters b/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters deleted file mode 100644 index a7761ab..0000000 --- a/RenderScript/build/WindowsStore/RenderScript.WindowsPhone/RenderScript.WindowsPhone.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/RenderScript/include/BlendStateDescParser.h b/RenderScript/include/BlendStateDescParser.h new file mode 100644 index 0000000..59f5664 --- /dev/null +++ b/RenderScript/include/BlendStateDescParser.h @@ -0,0 +1,41 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "PipelineState.h" +#include "LuaBindings.h" + +namespace Diligent +{ + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) ; + virtual void GetValue( lua_State *L, const void* pBasePointer )override; + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override; + private: + BindingsMapType m_Bindings; + }; +} diff --git a/RenderScript/include/BlendStateParser.h b/RenderScript/include/BlendStateParser.h deleted file mode 100644 index 9589488..0000000 --- a/RenderScript/include/BlendStateParser.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -#include "LuaWrappers.h" -#include "LuaBindings.h" -#include "EngineObjectParserCommon.h" -#include "ClassMethodBinding.h" - - -namespace Diligent -{ - class BlendStateParser : public EngineObjectParserCommon - { - public: - BlendStateParser( IRenderDevice *pRenderDevice, lua_State *L ); - static const Char* BlendStateLibName; - - protected: - virtual void CreateObj( lua_State *L ); - - private: - // BlendStateDesc structure does not provide storage for the Name field. - // We need to use ObjectDescWrapper<> to be able to store the field. - typedef ObjectDescWrapper SBSDescWrapper; - - int SetBlendState( lua_State *L ); - ClassMethodCaller m_SetBlendBinding; - }; -} diff --git a/RenderScript/include/BufferParser.h b/RenderScript/include/BufferParser.h index e9a6053..e375d19 100644 --- a/RenderScript/include/BufferParser.h +++ b/RenderScript/include/BufferParser.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/RenderScript/include/BufferViewParser.h b/RenderScript/include/BufferViewParser.h index a1b003d..03e6b10 100644 --- a/RenderScript/include/BufferViewParser.h +++ b/RenderScript/include/BufferViewParser.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/RenderScript/include/ClassMethodBinding.h b/RenderScript/include/ClassMethodBinding.h index 90c4259..141261a 100644 --- a/RenderScript/include/ClassMethodBinding.h +++ b/RenderScript/include/ClassMethodBinding.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/RenderScript/include/ConvenienceFunctions.h b/RenderScript/include/ConvenienceFunctions.h index 2a4df13..23a08f4 100644 --- a/RenderScript/include/ConvenienceFunctions.h +++ b/RenderScript/include/ConvenienceFunctions.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. @@ -28,7 +28,9 @@ #include "ScriptParser.h" #include "DataBlobImpl.h" #ifdef _WIN32 -# define NOMINMAX +# ifndef NOMINMAX +# define NOMINMAX +# endif # include #endif @@ -39,7 +41,7 @@ Diligent::RefCntAutoPtr CreateRenderScriptFromFile( cons { bool bSuccess = true; Diligent::RefCntAutoPtr pScriptParser; -#ifdef PLATFORM_WINDOWS +#ifdef PLATFORM_WIN32 do { #endif @@ -69,7 +71,7 @@ Diligent::RefCntAutoPtr CreateRenderScriptFromFile( cons ErrorMsg = err.what(); } -#ifdef PLATFORM_WINDOWS +#ifdef PLATFORM_WIN32 if( !bSuccess ) { if( IDRETRY != MessageBoxA( NULL, "Failed to parse the script. Retry?", "Lua parser error", MB_ICONERROR | MB_ABORTRETRYIGNORE ) ) diff --git a/RenderScript/include/Debug.h b/RenderScript/include/Debug.h index bd22bfb..cd19f10 100644 --- a/RenderScript/include/Debug.h +++ b/RenderScript/include/Debug.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/RenderScript/include/DepthStencilStateDescParser.h b/RenderScript/include/DepthStencilStateDescParser.h new file mode 100644 index 0000000..340d05e --- /dev/null +++ b/RenderScript/include/DepthStencilStateDescParser.h @@ -0,0 +1,43 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "PipelineState.h" +#include "LuaBindings.h" +#include "EnumMappings.h" + +namespace Diligent +{ + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) ; + virtual void GetValue( lua_State *L, const void* pBasePointer )override; + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override; + private: + BindingsMapType m_Bindings; + ComparisonFuncEnumMapping m_CmpFuncEnumMapping; + }; +} diff --git a/RenderScript/include/DepthStencilStateParser.h b/RenderScript/include/DepthStencilStateParser.h deleted file mode 100644 index fb0f2cb..0000000 --- a/RenderScript/include/DepthStencilStateParser.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -#include "LuaWrappers.h" -#include "LuaBindings.h" -#include "EngineObjectParserCommon.h" -#include "ClassMethodBinding.h" - -namespace Diligent -{ - class DepthStencilStateParser : public EngineObjectParserCommon - { - public: - DepthStencilStateParser( IRenderDevice *pRenderDevice, lua_State *L ); - static const Char* DepthStencilStateLibName; - - protected: - virtual void CreateObj( lua_State *L ); - - private: - // DepthStencilStateDesc structure does not provide storage for the Name field. - // We need to use ObjectDescWrapper<> to be able to store the field. - typedef ObjectDescWrapper SDSSDescWrapper; - - int SetDepthStencilState( lua_State *L ); - ClassMethodCaller m_SetDepthStencilBinding; - - ComparisonFuncEnumMapping m_CmpFuncEnumMapping; - }; -} diff --git a/RenderScript/include/DeviceContextFuncBindings.h b/RenderScript/include/DeviceContextFuncBindings.h index bb2f880..a03c3f0 100644 --- a/RenderScript/include/DeviceContextFuncBindings.h +++ b/RenderScript/include/DeviceContextFuncBindings.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. @@ -27,12 +27,17 @@ #include "LuaBindings.h" #include "ClassMethodBinding.h" +namespace std +{ + DEFINE_ENUM_HASH( Diligent::COMMIT_SHADER_RESOURCES_FLAG ) +} + namespace Diligent { class DeviceContextFuncBindings { public: - DeviceContextFuncBindings( IRenderDevice *pRenderDevice, lua_State *L, class TextureViewParser *pTexViewPasrser ); + DeviceContextFuncBindings( IRenderDevice *pRenderDevice, lua_State *L, class TextureViewParser *pTexViewPasrser, class ShaderResourceBindingParser *pSRBParser, class PSODescParser *pPSOParser ); private: int SetRenderTargets( lua_State * ); @@ -44,6 +49,22 @@ namespace Diligent int ClearDepthStencil( lua_State * ); ClassMethodCaller m_ClearDepthStencilBinding; + int SetStencilRef( lua_State * ); + ClassMethodCaller m_SetStencilRefBinding; + + int SetBlendFactors( lua_State * ); + ClassMethodCaller m_SetBlendFactorsBinding; + + int CommitShaderResources( lua_State * ); + ClassMethodCaller m_CommitShaderResourcesBinding; + + int TransitionShaderResources( lua_State * ); + ClassMethodCaller m_TransitionShaderResourcesBinding; + + EnumMapping m_CommitShaderResFlagsEnumMapping; + String m_TexViewMetatableName; + String m_ShaderResBindingMetatableName; + String m_PSOMetatableName; }; } diff --git a/RenderScript/include/DrawAttribsParser.h b/RenderScript/include/DrawAttribsParser.h index 0b855ac..88da020 100644 --- a/RenderScript/include/DrawAttribsParser.h +++ b/RenderScript/include/DrawAttribsParser.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/RenderScript/include/EngineObjectParserBase.h b/RenderScript/include/EngineObjectParserBase.h index 55c0baa..7e0265c 100644 --- a/RenderScript/include/EngineObjectParserBase.h +++ b/RenderScript/include/EngineObjectParserBase.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/RenderScript/include/EngineObjectParserCommon.h b/RenderScript/include/EngineObjectParserCommon.h index ba55e21..dfef174 100644 --- a/RenderScript/include/EngineObjectParserCommon.h +++ b/RenderScript/include/EngineObjectParserCommon.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/RenderScript/include/EnumMappings.h b/RenderScript/include/EnumMappings.h index 6b61161..bc8c76c 100644 --- a/RenderScript/include/EnumMappings.h +++ b/RenderScript/include/EnumMappings.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. @@ -36,7 +36,7 @@ template<>struct hash \ namespace std { - DEFINE_ENUM_HASH( Diligent::TEXTURE_TYPE ) + DEFINE_ENUM_HASH( Diligent::RESOURCE_DIMENSION ) DEFINE_ENUM_HASH( Diligent::TEXTURE_FORMAT ) DEFINE_ENUM_HASH( Diligent::VALUE_TYPE ) DEFINE_ENUM_HASH( Diligent::USAGE ) @@ -46,6 +46,7 @@ namespace std DEFINE_ENUM_HASH( Diligent::CPU_ACCESS_FLAG ) DEFINE_ENUM_HASH( Diligent::COMPARISON_FUNCTION ) DEFINE_ENUM_HASH( Diligent::BIND_SHADER_RESOURCES_FLAGS ) + DEFINE_ENUM_HASH( Diligent::SHADER_TYPE ) } namespace Diligent @@ -82,10 +83,10 @@ namespace Diligent TextureFormatEnumMapping(); }; - class TextureTypeEnumMapping : public EnumMapping < Diligent::TEXTURE_TYPE > + class ResourceDimEnumMapping : public EnumMapping < Diligent::RESOURCE_DIMENSION > { public: - TextureTypeEnumMapping(); + ResourceDimEnumMapping(); }; class ValueTypeEnumMapping : public EnumMapping < Diligent::VALUE_TYPE > @@ -105,4 +106,10 @@ namespace Diligent public: BindShaderResourcesFlagEnumMapping(); }; + + class ShaderTypeEnumMapping : public EnumMapping + { + public: + ShaderTypeEnumMapping(); + }; } diff --git a/RenderScript/include/InputLayoutDescParser.h b/RenderScript/include/InputLayoutDescParser.h new file mode 100644 index 0000000..2da56ca --- /dev/null +++ b/RenderScript/include/InputLayoutDescParser.h @@ -0,0 +1,51 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "LuaWrappers.h" +#include "LuaBindings.h" + +namespace std +{ + DEFINE_ENUM_HASH( Diligent::LayoutElement::FREQUENCY ) +} + +namespace Diligent +{ + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t InputLayoutOffset, size_t ElementsBufferOffset ); + virtual void GetValue( lua_State *L, const void* pBasePointer )override; + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override; + + private: + BindingsMapType m_Bindings; + ValueTypeEnumMapping m_ValueTypeEnumMapping; + EnumMapping < LayoutElement::FREQUENCY > m_FrequencyEnumMapping; + size_t m_LayoutElementsBufferOffset; + }; + +} diff --git a/RenderScript/include/LayoutDescParser.h b/RenderScript/include/LayoutDescParser.h deleted file mode 100644 index 62d32dd..0000000 --- a/RenderScript/include/LayoutDescParser.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -#include "LuaWrappers.h" -#include "LuaBindings.h" -#include "EngineObjectParserCommon.h" -#include "ClassMethodBinding.h" - -namespace Diligent -{ - class LayoutDescParser : public EngineObjectParserCommon - { - public: - LayoutDescParser( IRenderDevice *pRenderDevice, lua_State *L ); - static const Char* LayoutDescLibName; - - protected: - virtual void CreateObj( lua_State *L ); - - private: - // LayoutDesc structure does not provide storage for the Name field, - // nor does it provide storage for layout elements. - // We need to use LayoutDescWrapper to be able to store the data. - struct LayoutDescWrapper : ObjectDescWrapper < LayoutDesc > - { - std::vector ElementsBuffer; - }; - - - int SetInputLayout( lua_State *L ); - ClassMethodCaller m_SetInputLayoutBinding; - }; -} diff --git a/RenderScript/include/LuaBindings.h b/RenderScript/include/LuaBindings.h index b9dcace..2799bd1 100644 --- a/RenderScript/include/LuaBindings.h +++ b/RenderScript/include/LuaBindings.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. @@ -226,7 +226,8 @@ namespace Diligent }; - inline void ParseLuaTable( lua_State *L, int Index, void* pBasePointer, BindingsMapType &Bindings ) + template + inline void ParseLuaTable( lua_State *L, int Index, void* pBasePointer, TableElementParser ElemParser ) { CheckType( L, Index, LUA_TTABLE ); @@ -248,20 +249,31 @@ namespace Diligent // The string is always zero-terminated and Lua ensures that this pointer is valid as long // as the corresponding value is in the stack. auto Key = lua_tostring( L, -2 ); - auto Binding = Bindings.find( Key ); - if( Binding != Bindings.end() ) - { - Binding->second->SetValue( L, -1, pBasePointer ); - } - else - { - SCRIPT_PARSING_ERROR( L, "Unknown Member ", Key ); - } + ElemParser(-1, pBasePointer, Key); + // Pop value from the stack, but KEEP Key for the next iteration lua_pop( L, 1 ); } } + inline void ParseLuaTable( lua_State *L, int Index, void* pBasePointer, BindingsMapType &Bindings ) + { + ParseLuaTable( L, Index, pBasePointer, + [&](int Index, void* pBasePointer, const char *Key) + { + auto Binding = Bindings.find( Key ); + if( Binding != Bindings.end() ) + { + Binding->second->SetValue( L, Index, pBasePointer ); + } + else + { + SCRIPT_PARSING_ERROR( L, "Unknown Member \"", Key, '\"' ); + } + } + ); + } + template inline void ParseLuaArray( lua_State *L, int Index, void* pBasePointer, ArrayElemParser ElemParser ) { @@ -326,7 +338,7 @@ namespace Diligent } else { - SCRIPT_PARSING_ERROR( L, "Unknown Member ", Field ); + SCRIPT_PARSING_ERROR( L, "Unknown Member \"", Field, '\"' ); } } @@ -339,7 +351,7 @@ namespace Diligent } else { - SCRIPT_PARSING_ERROR( L, "Unknown Member ", Field ); + SCRIPT_PARSING_ERROR( L, "Unknown Member \"", Field, '\"' ); } } @@ -413,7 +425,7 @@ namespace Diligent } else { - UNEXPECTED( "Enum value not found in the map" ); + UNEXPECTED( "Enum value (", Val, ") not found in the map" ); SCRIPT_PARSING_ERROR( L, "Enum value (", Val, ") not found in the map" ); } } @@ -584,14 +596,21 @@ namespace Diligent VERIFY( Metatables.size() == 1, "Ambiguous metatable" ); const auto& MetatableName = *Metatables.begin(); auto pObject = GetMemberByOffest( pBasePointer, m_MemberOffset ); - auto ppNewObject = reinterpret_cast(lua_newuserdata( L, sizeof( ObjectType* ) )); - *ppNewObject = pObject; - pObject->AddRef(); - // Push onto the stack the metatable associated with name given in the registry - luaL_getmetatable( L, MetatableName.c_str() ); // -0 | +1 -> +1 - // Pop a table from the top of the stack and set it as the new metatable - // for the value at the given index (which is where the new user datum is) - lua_setmetatable( L, -2 ); // -1 | +0 -> -1 + if( pObject ) + { + auto ppNewObject = reinterpret_cast(lua_newuserdata( L, sizeof( ObjectType* ) )); + *ppNewObject = pObject; + pObject->AddRef(); + // Push onto the stack the metatable associated with name given in the registry + luaL_getmetatable( L, MetatableName.c_str() ); // -0 | +1 -> +1 + // Pop a table from the top of the stack and set it as the new metatable + // for the value at the given index (which is where the new user datum is) + lua_setmetatable( L, -2 ); // -1 | +0 -> -1 + } + else + { + lua_pushnil(L); + } } virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) diff --git a/RenderScript/include/LuaFunctionBinding.h b/RenderScript/include/LuaFunctionBinding.h index a51a7b9..863becd 100644 --- a/RenderScript/include/LuaFunctionBinding.h +++ b/RenderScript/include/LuaFunctionBinding.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/RenderScript/include/LuaWrappers.h b/RenderScript/include/LuaWrappers.h index 6e17a65..bf7d653 100644 --- a/RenderScript/include/LuaWrappers.h +++ b/RenderScript/include/LuaWrappers.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/RenderScript/include/PSODescParser.h b/RenderScript/include/PSODescParser.h new file mode 100644 index 0000000..01d8fc8 --- /dev/null +++ b/RenderScript/include/PSODescParser.h @@ -0,0 +1,56 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "LuaWrappers.h" +#include "LuaBindings.h" +#include "EngineObjectParserCommon.h" +#include "ClassMethodBinding.h" +#include "PipelineState.h" + +namespace Diligent +{ + class PSODescParser : public EngineObjectParserCommon + { + public: + PSODescParser( IRenderDevice *pRenderDevice, lua_State *L ); + static const Char* PSODescLibName; + + protected: + virtual void CreateObj( lua_State *L ); + + private: + // PipelineStateDesc structure does not provide storage for the Name field. + // We need to use ObjectDescWrapper<> to be able to store the field. + struct PSODescWrapper : PipelineStateDesc + { + String NameBuffer; + std::vector LayoutElementsBuffer; + }; + friend class MemberBinder; + + int SetPSO( lua_State *L ); + ClassMethodCaller m_SetPSOBinding; + }; +} diff --git a/RenderScript/include/ParsingErrors.h b/RenderScript/include/ParsingErrors.h index 5b7f860..8ca794b 100644 --- a/RenderScript/include/ParsingErrors.h +++ b/RenderScript/include/ParsingErrors.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/RenderScript/include/RasterizerStateDescParser.h b/RenderScript/include/RasterizerStateDescParser.h new file mode 100644 index 0000000..78a0023 --- /dev/null +++ b/RenderScript/include/RasterizerStateDescParser.h @@ -0,0 +1,50 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "PipelineState.h" +#include "LuaBindings.h" + +namespace std +{ + DEFINE_ENUM_HASH( Diligent::FILL_MODE ) + DEFINE_ENUM_HASH( Diligent::CULL_MODE ) +} + +namespace Diligent +{ + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) ; + virtual void GetValue( lua_State *L, const void* pBasePointer )override; + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override; + private: + BindingsMapType m_Bindings; + + EnumMapping < FILL_MODE > m_FillModeEnumMapping; + EnumMapping < CULL_MODE > m_CullModeEnumMapping; + }; +} diff --git a/RenderScript/include/RasterizerStateParser.h b/RenderScript/include/RasterizerStateParser.h deleted file mode 100644 index 22ab5e9..0000000 --- a/RenderScript/include/RasterizerStateParser.h +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#pragma once - -#include "LuaWrappers.h" -#include "LuaBindings.h" -#include "EngineObjectParserCommon.h" -#include "ClassMethodBinding.h" - - -namespace std -{ - DEFINE_ENUM_HASH( Diligent::FILL_MODE ) - DEFINE_ENUM_HASH( Diligent::CULL_MODE ) -} - -namespace Diligent -{ - class RasterizerStateParser : public EngineObjectParserCommon - { - public: - RasterizerStateParser( IRenderDevice *pRenderDevice, lua_State *L ); - static const Char* RasterizerStateLibName; - - protected: - virtual void CreateObj( lua_State *L ); - - private: - // RasterizerStateDesc structure does not provide storage for the Name field. - // We need to use ObjectDescWrapper<> to be able to store the field. - typedef ObjectDescWrapper SRSDescWrapper; - - int SetRasterizerState( lua_State *L ); - ClassMethodCaller m_SetRasterizerBinding; - - EnumMapping < FILL_MODE > m_FillModeEnumMapping; - EnumMapping < CULL_MODE > m_CullModeEnumMapping; - }; -} diff --git a/RenderScript/include/ResourceMappingParser.h b/RenderScript/include/ResourceMappingParser.h index d191647..8be5f0a 100644 --- a/RenderScript/include/ResourceMappingParser.h +++ b/RenderScript/include/ResourceMappingParser.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. @@ -50,9 +50,6 @@ namespace Diligent virtual void PushExistingObject( lua_State *L, const void *pObject ); virtual void DestroyObj( void *pData ); - int BindShaderResources( lua_State *L ); - ClassMethodCaller < ResourceMappingParser > m_BindShaderResourcesBinding; - BindingsMapType m_Bindings; TextureViewParser *m_pTexViewParser; diff --git a/RenderScript/include/SamplerParser.h b/RenderScript/include/SamplerParser.h index 5829067..c3f0eb6 100644 --- a/RenderScript/include/SamplerParser.h +++ b/RenderScript/include/SamplerParser.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. @@ -37,6 +37,57 @@ namespace std namespace Diligent { + template + void InitSamplerParserBindings(BindingsMapType &Bindings, + EnumMapping &FilterTypeEnumMapping, + EnumMapping &TexAddrModeEnumMapping, + ComparisonFuncEnumMapping &CmpFuncEnumMapping) + { + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_POINT ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_LINEAR ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_ANISOTROPIC ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_COMPARISON_POINT ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_COMPARISON_LINEAR ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_COMPARISON_ANISOTROPIC ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_MINIMUM_POINT ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_MINIMUM_LINEAR ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_MINIMUM_ANISOTROPIC ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_MAXIMUM_POINT ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_MAXIMUM_LINEAR ); + DEFINE_ENUM_ELEMENT_MAPPING( FilterTypeEnumMapping, FILTER_TYPE_MAXIMUM_ANISOTROPIC ); + VERIFY( FilterTypeEnumMapping.m_Str2ValMap.size() == FILTER_TYPE_NUM_FILTERS - 1, "Unexpected map size. Did you update FILTER_TYPE enum?" ); + VERIFY( FilterTypeEnumMapping.m_Val2StrMap.size() == FILTER_TYPE_NUM_FILTERS - 1, "Unexpected map size. Did you update FILTER_TYPE enum?" ); + DEFINE_ENUM_BINDER( Bindings, StructType, MinFilter, FILTER_TYPE, FilterTypeEnumMapping ) + DEFINE_ENUM_BINDER( Bindings, StructType, MagFilter, FILTER_TYPE, FilterTypeEnumMapping ) + DEFINE_ENUM_BINDER( Bindings, StructType, MipFilter, FILTER_TYPE, FilterTypeEnumMapping ) + + + DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_WRAP ); + DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_MIRROR ); + DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_CLAMP ); + DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_BORDER ); + DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_MIRROR_ONCE ); + VERIFY( TexAddrModeEnumMapping.m_Str2ValMap.size() == TEXTURE_ADDRESS_NUM_MODES - 1, "Unexpected map size. Did you update TEXTURE_ADDRESS_MODE enum?" ); + VERIFY( TexAddrModeEnumMapping.m_Val2StrMap.size() == TEXTURE_ADDRESS_NUM_MODES - 1, "Unexpected map size. Did you update TEXTURE_ADDRESS_MODE enum?" ); + DEFINE_ENUM_BINDER( Bindings, StructType, AddressU, TEXTURE_ADDRESS_MODE, TexAddrModeEnumMapping ) + DEFINE_ENUM_BINDER( Bindings, StructType, AddressV, TEXTURE_ADDRESS_MODE, TexAddrModeEnumMapping ) + DEFINE_ENUM_BINDER( Bindings, StructType, AddressW, TEXTURE_ADDRESS_MODE, TexAddrModeEnumMapping ) + + + Validator DummyValidatorF( SkipValidationFunc ); + DEFINE_BINDER( Bindings, StructType, MipLODBias, Float32, DummyValidatorF ) + + Validator MaxAnisotropyValidator( "Max Anisotropy", 0, 32 ); + DEFINE_BINDER( Bindings, StructType, MaxAnisotropy, Uint32, MaxAnisotropyValidator ) + + DEFINE_ENUM_BINDER( Bindings, StructType, ComparisonFunc, COMPARISON_FUNCTION, CmpFuncEnumMapping ) + + DEFINE_BINDER( Bindings, StructType, BorderColor, RGBALoader, 0 ) + + DEFINE_BINDER( Bindings, StructType, MinLOD, Float32, DummyValidatorF ) + DEFINE_BINDER( Bindings, StructType, MaxLOD, Float32, DummyValidatorF ) + } + class SamplerParser : public EngineObjectParserCommon { public: diff --git a/RenderScript/include/ScissorRectParser.h b/RenderScript/include/ScissorRectParser.h index b887afc..e33544b 100644 --- a/RenderScript/include/ScissorRectParser.h +++ b/RenderScript/include/ScissorRectParser.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/RenderScript/include/ScriptParser.h b/RenderScript/include/ScriptParser.h index 8c960d8..93d47d1 100644 --- a/RenderScript/include/ScriptParser.h +++ b/RenderScript/include/ScriptParser.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. @@ -66,16 +66,13 @@ namespace Diligent void GetSamplerByName( const Char *SamplerName, ISampler** ppSampler ); - void GetVertexDescriptionByName( const Char *VertDescName, IVertexDescription** ppVertDesc ); void GetShaderByName( const Char *ShaderName, IShader** ppShader ); void GetBufferByName( const Char *BufferName, IBuffer** ppBuffer ); void GetTextureByName( const Char *TextureName, ITexture** ppTexture ); void GetResourceMappingByName( const Char *ResourceMappingName, IResourceMapping** ppResourceMapping ); void GetTextureViewByName( const Char *TextureViewName, ITextureView** ppTextureView ); void GetBufferViewByName( const Char *BufferViewName, IBufferView** ppTextureView ); - void GetDepthStencilStateByName( const Char *DSStateName, IDepthStencilState** ppDSState ); - void GetRasterizerStateByName( const Char *RSName, IRasterizerState** ppRS ); - void GetBlendStateByName( const Char *BSName, IBlendState** ppRS ); + void GetPipelineStateByName( const Char *PSOName, IPipelineState** ppPSO ); void GetShaderVariableByName( const Char *ShaderVarName, IShaderVariable** ppShaderVar ); template @@ -96,8 +93,6 @@ namespace Diligent void PushFuncStub( lua_State *L, const ISampler* pSampler ); void PushFuncStub( lua_State *L, const RefCntAutoPtr &pSampler ); - void PushFuncStub( lua_State *L, const IVertexDescription* pVertDesc ); - void PushFuncStub( lua_State *L, const RefCntAutoPtr &pVertDesc ); void PushFuncStub( lua_State *L, const IShader* pShader ); void PushFuncStub( lua_State *L, const RefCntAutoPtr &pShader ); void PushFuncStub( lua_State *L, const IBuffer* pBuffer ); @@ -111,16 +106,14 @@ namespace Diligent void PushFuncStub( lua_State *L, const RefCntAutoPtr &pTextureView ); void PushFuncStub( lua_State *L, const IBufferView* pBufferView ); void PushFuncStub( lua_State *L, const RefCntAutoPtr &pBufferView ); - void PushFuncStub( lua_State *L, const IDepthStencilState* pDSState ); - void PushFuncStub( lua_State *L, const RefCntAutoPtr &pDSState ); - void PushFuncStub( lua_State *L, const IRasterizerState* pRS ); - void PushFuncStub( lua_State *L, const RefCntAutoPtr &pRS ); - void PushFuncStub( lua_State *L, const IBlendState* pBS ); - void PushFuncStub( lua_State *L, const RefCntAutoPtr &pBS ); + void PushFuncStub( lua_State *L, const IPipelineState* pPSO ); + void PushFuncStub( lua_State *L, const RefCntAutoPtr &pPSO ); void PushFuncStub( lua_State *L, const Viewport &Viewport ); void PushFuncStub( lua_State *L, const Rect &Rect ); void PushFuncStub( lua_State *L, const IShaderVariable* pShaderVar ); void PushFuncStub( lua_State *L, const RefCntAutoPtr &pShaderVar ); + void PushFuncStub( lua_State *L, const IShaderResourceBinding* pShaderVar ); + void PushFuncStub( lua_State *L, const RefCntAutoPtr &pShaderVar ); private: ScriptParser *m_pScriptParser; @@ -132,7 +125,6 @@ namespace Diligent Diligent::RefCntAutoPtr m_pRenderDevice; LuaState m_LuaState; std::unique_ptr m_pSamplerParser; - std::unique_ptr m_pLayoutDescParser; std::unique_ptr m_pShaderParser; std::unique_ptr m_pBufferParser; std::unique_ptr m_pTextureParser; @@ -140,12 +132,11 @@ namespace Diligent std::unique_ptr m_pResourceMappingParser; std::unique_ptr m_pTextureViewParser; std::unique_ptr m_pBufferViewParser; - std::unique_ptr m_pDSStateParser; - std::unique_ptr m_pRSParser; - std::unique_ptr m_pBSParser; + std::unique_ptr m_pPSOParser; std::unique_ptr m_pDeviceCtxFuncBindings; std::unique_ptr m_pViewportParser; std::unique_ptr m_pScissorRectParser; std::unique_ptr m_pShaderVariableParser; + std::unique_ptr m_pShaderResBindingParser; }; } diff --git a/RenderScript/include/ShaderParser.h b/RenderScript/include/ShaderParser.h index 2967dd5..fdfb3da 100644 --- a/RenderScript/include/ShaderParser.h +++ b/RenderScript/include/ShaderParser.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. @@ -48,9 +48,14 @@ namespace Diligent struct ShaderCreationAttribsWrapper : ShaderCreationAttribs { String NameBuffer; + String SourceBuffer; String FilePathBuffer; String EntryPointBuffer; String SearchDirectoriesBuffer; + std::vector m_VarDescBuffer; + std::vector m_VarNamesBuffer; + std::vector m_StaticSamplersBuffer; + std::vector m_StaticSamplerTexNamesBuffer; }; protected: @@ -59,9 +64,6 @@ namespace Diligent private: - int SetShaders( lua_State *L ); - ClassMethodCaller < ShaderParser > m_SetShadersBinding; - ClassMethodCaller< ShaderParser > m_BindResourcesBinding; int BindResources( lua_State *L ); diff --git a/RenderScript/include/ShaderResourceBindingParser.h b/RenderScript/include/ShaderResourceBindingParser.h new file mode 100644 index 0000000..281ac54 --- /dev/null +++ b/RenderScript/include/ShaderResourceBindingParser.h @@ -0,0 +1,69 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#pragma once + +#include "LuaWrappers.h" +#include "LuaBindings.h" +#include "EngineObjectParserBase.h" +#include "ClassMethodBinding.h" +#include "EngineObjectParserCommon.h" + +namespace Diligent +{ + class ShaderResourceBindingParser : public EngineObjectParserBase + { + public: + ShaderResourceBindingParser( IRenderDevice *pRenderDevice, lua_State *L, + const String &PSOLibMetatableName, + const String &ResMappingMetatableName, + const String &ShaderVarMetatableRegistryName); + static const Char* ShaderResourceBindingLibName; + + virtual void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderResourceBinding** ppObject ); + + protected: + virtual void CreateObj( lua_State *L ); + virtual void DestroyObj( void *pData ); + virtual void ReadField( lua_State *L, void *pData, const Char *Field ); + virtual void UpdateField( lua_State *L, void *pData, const Char *Field ); + virtual void PushExistingObject( lua_State *L, const void *pObject ); + + private: + String m_PSOLibMetatableName; + String m_ResMappingMetatableName; + String m_ShaderVarMetatableRegistryName; + + BindShaderResourcesFlagEnumMapping m_BindShaderResFlagEnumMapping; + ShaderTypeEnumMapping m_ShaderTypeEnumMapping; + + int BindResources( lua_State *L ); + ClassMethodCaller < ShaderResourceBindingParser > m_BindResourcesBinding; + + int GetVariable( lua_State *L ); + ClassMethodCaller < ShaderResourceBindingParser > m_GetVariableBinding; + + int CreateShaderResourceBinding( lua_State *L ); + ClassMethodCaller m_CreateShaderResourceBinding; + }; +} diff --git a/RenderScript/include/ShaderVariableParser.h b/RenderScript/include/ShaderVariableParser.h index 5263e16..5641939 100644 --- a/RenderScript/include/ShaderVariableParser.h +++ b/RenderScript/include/ShaderVariableParser.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/RenderScript/include/TextureParser.h b/RenderScript/include/TextureParser.h index d6eb6a0..20aea0e 100644 --- a/RenderScript/include/TextureParser.h +++ b/RenderScript/include/TextureParser.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. @@ -49,7 +49,7 @@ namespace Diligent // We need to use ObjectDescWrapper<> to be able to store the field. typedef ObjectDescWrapper STexDescWrapper; - TextureTypeEnumMapping m_TexTypeEnumMapping; + ResourceDimEnumMapping m_TexTypeEnumMapping; TextureFormatEnumMapping m_TexFormatEnumMapping; // Note that different bind flags are allowed for different objects, diff --git a/RenderScript/include/TextureViewParser.h b/RenderScript/include/TextureViewParser.h index c97f28a..3ea135e 100644 --- a/RenderScript/include/TextureViewParser.h +++ b/RenderScript/include/TextureViewParser.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. @@ -63,7 +63,7 @@ namespace Diligent int SetSampler( lua_State * ); EnumMapping m_ViewTypeEnumMapping; - TextureTypeEnumMapping m_TexTypeEnumMapping; + ResourceDimEnumMapping m_TexTypeEnumMapping; TextureFormatEnumMapping m_TexFormatEnumMapping; EnumMemberBinder m_ViewTypeParser; EnumMapping m_UAVAccessFlagEnumMapping; diff --git a/RenderScript/include/ViewportParser.h b/RenderScript/include/ViewportParser.h index 86cfaa0..9633f5e 100644 --- a/RenderScript/include/ViewportParser.h +++ b/RenderScript/include/ViewportParser.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/RenderScript/include/pch.h b/RenderScript/include/pch.h index 9bb451f..86aa6a5 100644 --- a/RenderScript/include/pch.h +++ b/RenderScript/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/RenderScript/src/BlendStateDescParser.cpp b/RenderScript/src/BlendStateDescParser.cpp new file mode 100644 index 0000000..13458e3 --- /dev/null +++ b/RenderScript/src/BlendStateDescParser.cpp @@ -0,0 +1,154 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#include "pch.h" +#include "BlendStateDescParser.h" +#include "LuaWrappers.h" +#include "ClassMethodBinding.h" + + +namespace std +{ + DEFINE_ENUM_HASH( Diligent::BLEND_FACTOR ) + DEFINE_ENUM_HASH( Diligent::BLEND_OPERATION ) + DEFINE_ENUM_HASH( Diligent::COLOR_MASK ) +} + +namespace Diligent +{ + class RenderTargetBlendDescArrayParser; + + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + DEFINE_BINDER( m_Bindings, RenderTargetBlendDesc, BlendEnable, Bool, Validator() ) + + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_ZERO); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_ONE); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC_COLOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC_COLOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC_ALPHA); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC_ALPHA); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_DEST_ALPHA); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_DEST_ALPHA); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_DEST_COLOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_DEST_COLOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC_ALPHA_SAT); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_BLEND_FACTOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_BLEND_FACTOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC1_COLOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC1_COLOR); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC1_ALPHA); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC1_ALPHA); + VERIFY( m_BlendFactorEnumMapping.m_Str2ValMap.size() == BLEND_FACTOR_NUM_FACTORS - 1, + "Unexpected map size. Did you update BLEND_FACTOR enum?" ); + VERIFY( m_BlendFactorEnumMapping.m_Val2StrMap.size() == BLEND_FACTOR_NUM_FACTORS - 1, + "Unexpected map size. Did you update BLEND_FACTOR enum?" ); + + DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, SrcBlend, BLEND_FACTOR, m_BlendFactorEnumMapping ); + DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, DestBlend, BLEND_FACTOR, m_BlendFactorEnumMapping ); + DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, SrcBlendAlpha, BLEND_FACTOR, m_BlendFactorEnumMapping ); + DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, DestBlendAlpha, BLEND_FACTOR, m_BlendFactorEnumMapping ); + + + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_ADD ); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_SUBTRACT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_REV_SUBTRACT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_MIN ); + DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_MAX ); + VERIFY( m_BlendOpEnumMapping.m_Str2ValMap.size() == BLEND_OPERATION_NUM_OPERATIONS - 1, + "Unexpected map size. Did you update BLEND_OPERATION enum?" ); + VERIFY( m_BlendOpEnumMapping.m_Val2StrMap.size() == BLEND_OPERATION_NUM_OPERATIONS - 1, + "Unexpected map size. Did you update BLEND_OPERATION enum?" ); + + DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, BlendOp, BLEND_OPERATION, m_BlendOpEnumMapping ); + DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, BlendOpAlpha, BLEND_OPERATION, m_BlendOpEnumMapping ); + + + DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_RED ); + DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_GREEN ); + DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_BLUE ); + DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_ALPHA ); + DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_ALL ); + DEFINE_FLAGS_BINDER( m_Bindings, RenderTargetBlendDesc, RenderTargetWriteMask, COLOR_MASK, m_ColorMaskEnumMapping ); + } + + virtual void GetValue( lua_State *L, const void* pBasePointer ) + { + const auto &RTs = GetMemberByOffest< const RenderTargetBlendDesc >(pBasePointer, m_MemberOffset); + PushLuaArray( L, &RTs, &RTs+BlendStateDesc::MaxRenderTargets, [&](const RenderTargetBlendDesc &Elem) + { + PushLuaTable( L, &Elem, m_Bindings ); + } + ); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) + { + ParseLuaArray( L, Index, pBasePointer, [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) + { + VERIFY( pBasePointer == _pBasePointer, "Sanity check" ); + auto &RenderTargets = GetMemberByOffest( pBasePointer, m_MemberOffset ); + + auto MaxRTs = BlendStateDesc::MaxRenderTargets; + if( !(NewArrayIndex >= 1 && NewArrayIndex <= MaxRTs) ) + SCRIPT_PARSING_ERROR( L, "Incorrect render target index ", NewArrayIndex, ". Only 1..", MaxRTs, " are allowed" ); + + ParseLuaTable( L, StackIndex, &RenderTargets + (NewArrayIndex-1), m_Bindings ); + } + ); + } + private: + BindingsMapType m_Bindings; + + EnumMapping < BLEND_FACTOR > m_BlendFactorEnumMapping; + EnumMapping < BLEND_OPERATION > m_BlendOpEnumMapping; + EnumMapping < COLOR_MASK > m_ColorMaskEnumMapping; + }; + + + MemberBinder :: MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + DEFINE_BINDER( m_Bindings, BlendStateDesc, AlphaToCoverageEnable, Bool, Validator() ) + DEFINE_BINDER( m_Bindings, BlendStateDesc, IndependentBlendEnable, Bool, Validator() ) + + DEFINE_BINDER( m_Bindings, BlendStateDesc, RenderTargets, RenderTargetBlendDescArrayParser, 0 ) + } + + void MemberBinder ::GetValue(lua_State *L, const void* pBasePointer) + { + const auto &BlendDesc = GetMemberByOffest< BlendStateDesc >(pBasePointer, m_MemberOffset); + PushLuaTable(L, &BlendDesc, m_Bindings); + } + + void MemberBinder ::SetValue(lua_State *L, int Index, void* pBasePointer) + { + auto &BlendDesc = GetMemberByOffest< BlendStateDesc>( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &BlendDesc, m_Bindings ); + } +} diff --git a/RenderScript/src/BlendStateParser.cpp b/RenderScript/src/BlendStateParser.cpp deleted file mode 100644 index adf26ae..0000000 --- a/RenderScript/src/BlendStateParser.cpp +++ /dev/null @@ -1,196 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#include "pch.h" -#include "BlendStateParser.h" - -namespace std -{ - DEFINE_ENUM_HASH( Diligent::BLEND_FACTOR ) - DEFINE_ENUM_HASH( Diligent::BLEND_OPERATION ) - DEFINE_ENUM_HASH( Diligent::COLOR_MASK ) -} - -namespace Diligent -{ - class RenderTargetBlendStateParser; - - template<> - class MemberBinder : public MemberBinderBase - { - public: - MemberBinder( size_t MemberOffset, size_t Dummy ) : - MemberBinderBase( MemberOffset ) - { - DEFINE_BINDER( m_Bindings, RenderTargetBlendDesc, BlendEnable, Bool, Validator() ) - - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_ZERO); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_ONE); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC_COLOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC_COLOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC_ALPHA); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC_ALPHA); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_DEST_ALPHA); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_DEST_ALPHA); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_DEST_COLOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_DEST_COLOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC_ALPHA_SAT); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_BLEND_FACTOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_BLEND_FACTOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC1_COLOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC1_COLOR); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_SRC1_ALPHA); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendFactorEnumMapping, BLEND_FACTOR_INV_SRC1_ALPHA); - VERIFY( m_BlendFactorEnumMapping.m_Str2ValMap.size() == BLEND_FACTOR_NUM_FACTORS - 1, - "Unexpected map size. Did you update BLEND_FACTOR enum?" ); - VERIFY( m_BlendFactorEnumMapping.m_Val2StrMap.size() == BLEND_FACTOR_NUM_FACTORS - 1, - "Unexpected map size. Did you update BLEND_FACTOR enum?" ); - - DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, SrcBlend, BLEND_FACTOR, m_BlendFactorEnumMapping ); - DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, DestBlend, BLEND_FACTOR, m_BlendFactorEnumMapping ); - DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, SrcBlendAlpha, BLEND_FACTOR, m_BlendFactorEnumMapping ); - DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, DestBlendAlpha, BLEND_FACTOR, m_BlendFactorEnumMapping ); - - - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_ADD ); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_SUBTRACT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_REV_SUBTRACT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_MIN ); - DEFINE_ENUM_ELEMENT_MAPPING( m_BlendOpEnumMapping, BLEND_OPERATION_MAX ); - VERIFY( m_BlendOpEnumMapping.m_Str2ValMap.size() == BLEND_OPERATION_NUM_OPERATIONS - 1, - "Unexpected map size. Did you update BLEND_OPERATION enum?" ); - VERIFY( m_BlendOpEnumMapping.m_Val2StrMap.size() == BLEND_OPERATION_NUM_OPERATIONS - 1, - "Unexpected map size. Did you update BLEND_OPERATION enum?" ); - - DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, BlendOp, BLEND_OPERATION, m_BlendOpEnumMapping ); - DEFINE_ENUM_BINDER( m_Bindings, RenderTargetBlendDesc, BlendOpAlpha, BLEND_OPERATION, m_BlendOpEnumMapping ); - - - DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_RED ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_GREEN ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_BLUE ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_ALPHA ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ColorMaskEnumMapping, COLOR_MASK_ALL ); - DEFINE_FLAGS_BINDER( m_Bindings, RenderTargetBlendDesc, RenderTargetWriteMask, COLOR_MASK, m_ColorMaskEnumMapping ); - } - - virtual void GetValue( lua_State *L, const void* pBasePointer ) - { - const auto &RTs = GetMemberByOffest< const RenderTargetBlendDesc >(pBasePointer, m_MemberOffset); - PushLuaArray( L, &RTs, &RTs+BlendStateDesc::MaxRenderTargets, [&](const RenderTargetBlendDesc &Elem) - { - PushLuaTable( L, &Elem, m_Bindings ); - } - ); - } - - virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) - { - ParseLuaArray( L, Index, pBasePointer, [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) - { - VERIFY( pBasePointer == _pBasePointer, "Sanity check" ); - auto &RenderTargets = GetMemberByOffest( pBasePointer, m_MemberOffset ); - - auto MaxRTs = BlendStateDesc::MaxRenderTargets; - if( !(NewArrayIndex >= 1 && NewArrayIndex <= MaxRTs) ) - SCRIPT_PARSING_ERROR( L, "Incorrect render target index ", NewArrayIndex, ". Only 1..", MaxRTs, " are allowed" ); - - ParseLuaTable( L, StackIndex, &RenderTargets + (NewArrayIndex-1), m_Bindings ); - } - ); - } - private: - BindingsMapType m_Bindings; - - EnumMapping < BLEND_FACTOR > m_BlendFactorEnumMapping; - EnumMapping < BLEND_OPERATION > m_BlendOpEnumMapping; - EnumMapping < COLOR_MASK > m_ColorMaskEnumMapping; - }; - - - const Char* BlendStateParser::BlendStateLibName = "BlendState"; - - BlendStateParser::BlendStateParser( IRenderDevice *pRenderDevice, lua_State *L ) : - EngineObjectParserCommon( pRenderDevice, L, BlendStateLibName ), - m_SetBlendBinding( this, L, "Context", "SetBlendState", &BlendStateParser::SetBlendState ) - { - DEFINE_BUFFERED_STRING_BINDER( m_Bindings, SBSDescWrapper, Name, NameBuffer ) - - DEFINE_BINDER( m_Bindings, SBSDescWrapper, AlphaToCoverageEnable, Bool, Validator() ) - DEFINE_BINDER( m_Bindings, SBSDescWrapper, IndependentBlendEnable, Bool, Validator() ) - - DEFINE_BINDER( m_Bindings, SBSDescWrapper, RenderTargets, RenderTargetBlendStateParser, 0 ) - }; - - void BlendStateParser::CreateObj( lua_State *L ) - { - INIT_LUA_STACK_TRACKING( L ); - - SBSDescWrapper BlendDesc; - ParseLuaTable( L, 1, &BlendDesc, m_Bindings ); - - CHECK_LUA_STACK_HEIGHT(); - - auto ppBlendState = reinterpret_cast(lua_newuserdata( L, sizeof( IBlendState* ) )); - *ppBlendState = nullptr; - m_pRenderDevice->CreateBlendState( BlendDesc, ppBlendState ); - if( *ppBlendState == nullptr ) - SCRIPT_PARSING_ERROR( L, "Failed to create blend state object" ) - - CHECK_LUA_STACK_HEIGHT( +1 ); - } - - int BlendStateParser::SetBlendState( lua_State *L ) - { - auto *pBS = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); - - auto NumArgs = lua_gettop( L ); - float BlendFactors[4] = { 1, 1, 1, 1 }; - if( NumArgs >= 2 ) - { - INIT_LUA_STACK_TRACKING( L ); - - ParseLuaArray( L, 2, BlendFactors, [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) - { - VERIFY( BlendFactors == _pBasePointer, "Sanity check" ); - if( !(NewArrayIndex >= 1 && NewArrayIndex <= 4) ) - SCRIPT_PARSING_ERROR( L, "Incorrect blend factor index ", NewArrayIndex, ". Only 1..4 are allowed." ); - - BlendFactors[NewArrayIndex - 1] = ReadValueFromLua( L, StackIndex ); - } - ); - - CHECK_LUA_STACK_HEIGHT(); - } - - Uint32 SampleMask = 0xFFFFFFFF; - if( NumArgs >= 3 ) - { - SampleMask = ReadValueFromLua( L, 3 ); - } - - auto *pContext = LoadDeviceContextFromRegistry( L ); - pContext->SetBlendState( pBS, BlendFactors, SampleMask ); - return 0; - } -} diff --git a/RenderScript/src/BufferParser.cpp b/RenderScript/src/BufferParser.cpp index efa2d2a..0dffd13 100644 --- a/RenderScript/src/BufferParser.cpp +++ b/RenderScript/src/BufferParser.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/RenderScript/src/BufferViewParser.cpp b/RenderScript/src/BufferViewParser.cpp index c86bace..a1bff10 100644 --- a/RenderScript/src/BufferViewParser.cpp +++ b/RenderScript/src/BufferViewParser.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/RenderScript/src/DepthStencilStateDescParser.cpp b/RenderScript/src/DepthStencilStateDescParser.cpp new file mode 100644 index 0000000..aed7235 --- /dev/null +++ b/RenderScript/src/DepthStencilStateDescParser.cpp @@ -0,0 +1,103 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#include "pch.h" +#include "DepthStencilStateDescParser.h" + +namespace std +{ + DEFINE_ENUM_HASH( Diligent::STENCIL_OP ) +} + +namespace Diligent +{ + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_KEEP ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_ZERO ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_REPLACE ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_INCR_SAT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_DECR_SAT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_INVERT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_INCR_WRAP ); + DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_DECR_WRAP ); + VERIFY( m_StencilOpEnumMapping.m_Str2ValMap.size() == STENCIL_OP_NUM_OPS - 1, + "Unexpected map size. Did you update STENCIL_OP enum?" ); + VERIFY( m_StencilOpEnumMapping.m_Val2StrMap.size() == STENCIL_OP_NUM_OPS - 1, + "Unexpected map size. Did you update STENCIL_OP enum?" ); + + DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilFailOp, STENCIL_OP, m_StencilOpEnumMapping ) + DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilDepthFailOp, STENCIL_OP, m_StencilOpEnumMapping ) + DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilPassOp, STENCIL_OP, m_StencilOpEnumMapping ) + DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilFunc, COMPARISON_FUNCTION, m_CmpFuncEnumMapping ) + } + + virtual void GetValue( lua_State *L, const void* pBasePointer ) + { + const auto &StOpDesc = GetMemberByOffest< StencilOpDesc >(pBasePointer, m_MemberOffset); + PushLuaTable( L, &StOpDesc, m_Bindings ); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) + { + auto &StOpDesc = GetMemberByOffest< StencilOpDesc >( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &StOpDesc, m_Bindings ); + } + + private: + BindingsMapType m_Bindings; + ComparisonFuncEnumMapping m_CmpFuncEnumMapping; + EnumMapping < STENCIL_OP > m_StencilOpEnumMapping; + }; + + MemberBinder::MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, DepthEnable, Bool, Validator() ) + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, DepthWriteEnable, Bool, Validator() ) + DEFINE_ENUM_BINDER( m_Bindings, DepthStencilStateDesc, DepthFunc, COMPARISON_FUNCTION, m_CmpFuncEnumMapping ) + + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, StencilEnable, Bool, Validator() ) + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, StencilReadMask, Uint8, Validator() ) + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, StencilWriteMask, Uint8, Validator() ) + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, FrontFace, StencilOpDesc, 0 ) + DEFINE_BINDER( m_Bindings, DepthStencilStateDesc, BackFace, StencilOpDesc, 0 ) + }; + + void MemberBinder ::GetValue(lua_State *L, const void* pBasePointer) + { + const auto &DSSDesc = GetMemberByOffest< DepthStencilStateDesc >(pBasePointer, m_MemberOffset); + PushLuaTable(L, &DSSDesc, m_Bindings); + } + + void MemberBinder ::SetValue(lua_State *L, int Index, void* pBasePointer) + { + auto &DSSDesc = GetMemberByOffest< DepthStencilStateDesc>( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &DSSDesc, m_Bindings ); + } +} diff --git a/RenderScript/src/DepthStencilStateParser.cpp b/RenderScript/src/DepthStencilStateParser.cpp deleted file mode 100644 index 4f95623..0000000 --- a/RenderScript/src/DepthStencilStateParser.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#include "pch.h" -#include "DepthStencilStateParser.h" - -namespace std -{ - DEFINE_ENUM_HASH( Diligent::STENCIL_OP ) -} - -namespace Diligent -{ - const Char* DepthStencilStateParser::DepthStencilStateLibName = "DepthStencilState"; - - template<> - class MemberBinder : public MemberBinderBase - { - public: - MemberBinder( size_t MemberOffset, size_t Dummy ) : - MemberBinderBase( MemberOffset ) - { - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_KEEP ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_ZERO ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_REPLACE ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_INCR_SAT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_DECR_SAT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_INVERT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_INCR_WRAP ); - DEFINE_ENUM_ELEMENT_MAPPING( m_StencilOpEnumMapping, STENCIL_OP_DECR_WRAP ); - VERIFY( m_StencilOpEnumMapping.m_Str2ValMap.size() == STENCIL_OP_NUM_OPS - 1, - "Unexpected map size. Did you update STENCIL_OP enum?" ); - VERIFY( m_StencilOpEnumMapping.m_Val2StrMap.size() == STENCIL_OP_NUM_OPS - 1, - "Unexpected map size. Did you update STENCIL_OP enum?" ); - - DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilFailOp, STENCIL_OP, m_StencilOpEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilDepthFailOp, STENCIL_OP, m_StencilOpEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilPassOp, STENCIL_OP, m_StencilOpEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, StencilOpDesc, StencilFunc, COMPARISON_FUNCTION, m_CmpFuncEnumMapping ) - } - - virtual void GetValue( lua_State *L, const void* pBasePointer ) - { - const auto &StOpDesc = GetMemberByOffest< StencilOpDesc >(pBasePointer, m_MemberOffset); - PushLuaTable( L, &StOpDesc, m_Bindings ); - } - - virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) - { - auto &StOpDesc = GetMemberByOffest< StencilOpDesc >( pBasePointer, m_MemberOffset ); - ParseLuaTable( L, Index, &StOpDesc, m_Bindings ); - } - - private: - BindingsMapType m_Bindings; - ComparisonFuncEnumMapping m_CmpFuncEnumMapping; - EnumMapping < STENCIL_OP > m_StencilOpEnumMapping; - }; - - DepthStencilStateParser::DepthStencilStateParser( IRenderDevice *pRenderDevice, lua_State *L ) : - EngineObjectParserCommon( pRenderDevice, L, DepthStencilStateLibName ), - m_SetDepthStencilBinding( this, L, "Context", "SetDepthStencilState", &DepthStencilStateParser::SetDepthStencilState ) - { - DEFINE_BUFFERED_STRING_BINDER( m_Bindings, SDSSDescWrapper, Name, NameBuffer ) - - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, DepthEnable, Bool, Validator() ) - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, DepthWriteEnable, Bool, Validator() ) - DEFINE_ENUM_BINDER( m_Bindings, SDSSDescWrapper, DepthFunc, COMPARISON_FUNCTION, m_CmpFuncEnumMapping ) - - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, StencilEnable, Bool, Validator() ) - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, StencilReadMask, Uint8, Validator() ) - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, StencilWriteMask, Uint8, Validator() ) - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, FrontFace, StencilOpDesc, 0 ) - DEFINE_BINDER( m_Bindings, SDSSDescWrapper, BackFace, StencilOpDesc, 0 ) - }; - - void DepthStencilStateParser::CreateObj( lua_State *L ) - { - INIT_LUA_STACK_TRACKING( L ); - - SDSSDescWrapper DepthStencilDesc; - ParseLuaTable( L, 1, &DepthStencilDesc, m_Bindings ); - - CHECK_LUA_STACK_HEIGHT(); - - auto ppDepthStencilState = reinterpret_cast(lua_newuserdata( L, sizeof( IDepthStencilState* ) )); - *ppDepthStencilState = nullptr; - m_pRenderDevice->CreateDepthStencilState( DepthStencilDesc, ppDepthStencilState ); - if( *ppDepthStencilState == nullptr ) - SCRIPT_PARSING_ERROR(L, "Failed to create depth stencil state") - - CHECK_LUA_STACK_HEIGHT( +1 ); - } - - int DepthStencilStateParser::SetDepthStencilState( lua_State *L ) - { - auto pVertDesc = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); - Uint8 StencilRef = 0; - if( lua_gettop( L ) > 1 ) - { - StencilRef = ReadValueFromLua( L, 2 ); - } - auto *pContext = LoadDeviceContextFromRegistry( L ); - pContext->SetDepthStencilState( pVertDesc, StencilRef ); - return 0; - } -} diff --git a/RenderScript/src/DeviceContextFuncBindings.cpp b/RenderScript/src/DeviceContextFuncBindings.cpp index 9525cf2..bf7e402 100644 --- a/RenderScript/src/DeviceContextFuncBindings.cpp +++ b/RenderScript/src/DeviceContextFuncBindings.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. @@ -26,15 +26,27 @@ #include "GraphicsUtilities.h" #include "TextureViewParser.h" #include "EngineObjectParserBase.h" +#include "ShaderResourceBindingParser.h" +#include "PSODescParser.h" namespace Diligent { - DeviceContextFuncBindings::DeviceContextFuncBindings( IRenderDevice *pRenderDevice, lua_State *L, TextureViewParser *pTexViewPasrser ) : + DeviceContextFuncBindings::DeviceContextFuncBindings( IRenderDevice *pRenderDevice, lua_State *L, + TextureViewParser *pTexViewPasrser, + ShaderResourceBindingParser *pSRBParser, + PSODescParser *pPSOParser) : m_SetRenderTargetsBinding(this, L, "Context", "SetRenderTargets", &DeviceContextFuncBindings::SetRenderTargets), m_ClearRenderTargetBinding(this, L, "Context", "ClearRenderTarget", &DeviceContextFuncBindings::ClearRenderTarget), m_ClearDepthStencilBinding(this, L, "Context", "ClearDepthStencil", &DeviceContextFuncBindings::ClearDepthStencil), - m_TexViewMetatableName( pTexViewPasrser->GetMetatableName() ) + m_SetStencilRefBinding(this, L, "Context", "SetStencilRef", &DeviceContextFuncBindings::SetStencilRef), + m_SetBlendFactorsBinding(this, L, "Context", "SetBlendFactors", &DeviceContextFuncBindings::SetBlendFactors), + m_CommitShaderResourcesBinding(this, L, "Context", "CommitShaderResources", &DeviceContextFuncBindings::CommitShaderResources), + m_TransitionShaderResourcesBinding(this, L, "Context", "TransitionShaderResources", &DeviceContextFuncBindings::TransitionShaderResources), + m_TexViewMetatableName( pTexViewPasrser->GetMetatableName() ), + m_ShaderResBindingMetatableName( pSRBParser->GetMetatableName() ), + m_PSOMetatableName(pPSOParser->GetMetatableName()) { + DEFINE_ENUM_ELEMENT_MAPPING( m_CommitShaderResFlagsEnumMapping, COMMIT_SHADER_RESOURCES_FLAG_TRANSITION_RESOURCES ); }; int DeviceContextFuncBindings::SetRenderTargets( lua_State *L ) @@ -142,4 +154,101 @@ namespace Diligent return 0; } + + int DeviceContextFuncBindings::SetStencilRef( lua_State *L ) + { + auto NumArgs = lua_gettop( L ); + + Uint32 StencilRef = 0; + if(NumArgs >= 1 ) + StencilRef = ReadValueFromLua( L, 1 ); + + auto *pContext = EngineObjectParserBase::LoadDeviceContextFromRegistry( L ); + pContext->SetStencilRef( StencilRef ); + + // Return no values to Lua + return 0; + } + + int DeviceContextFuncBindings::SetBlendFactors( lua_State *L ) + { + float BlendFactors[4] = {}; + auto NumArgs = lua_gettop( L ); + + for(int bf=0; bf < std::min(NumArgs, 4); ++bf) + BlendFactors[bf] = ReadValueFromLua( L, bf+1 ); + + auto *pContext = EngineObjectParserBase::LoadDeviceContextFromRegistry( L ); + pContext->SetBlendFactors( BlendFactors ); + + // Return no values to Lua + return 0; + } + + int DeviceContextFuncBindings::CommitShaderResources( lua_State *L ) + { + auto NumArgs = lua_gettop( L ); + IShaderResourceBinding *pShaderResBinding = nullptr; + int CurrArg = 1; + if(NumArgs >= CurrArg ) + { + if( lua_type( L, CurrArg ) == LUA_TUSERDATA ) + { + pShaderResBinding = *GetUserData( L, CurrArg, m_ShaderResBindingMetatableName.c_str() ); + ++CurrArg; + } + } + + Uint32 Flags = 0; + if(NumArgs >= CurrArg && + (lua_type( L, CurrArg ) == LUA_TSTRING || + lua_type( L, CurrArg ) == LUA_TTABLE ) ) + { + FlagsLoader CommitShaderResFlagsLoader(0, "CommitShaderResourcesFlag", m_CommitShaderResFlagsEnumMapping); + CommitShaderResFlagsLoader.SetValue( L, CurrArg, &Flags ); + ++CurrArg; + } + + auto *pContext = EngineObjectParserBase::LoadDeviceContextFromRegistry( L ); + pContext->CommitShaderResources( pShaderResBinding, Flags ); + + return 0; + } + + int DeviceContextFuncBindings::TransitionShaderResources( lua_State *L ) + { + auto NumArgs = lua_gettop( L ); + IPipelineState *pPSO = nullptr; + int CurrArg = 1; + + if(NumArgs >= CurrArg ) + { + if( lua_type( L, CurrArg ) == LUA_TUSERDATA ) + { + pPSO = *GetUserData( L, CurrArg, m_PSOMetatableName.c_str() ); + ++CurrArg; + } + } + + if( !pPSO ) + { + SCRIPT_PARSING_ERROR( L, "PSO is expected as the first argument" ); + } + + IShaderResourceBinding *pShaderResBinding = nullptr; + if(NumArgs >= CurrArg ) + { + if( lua_type( L, CurrArg ) == LUA_TUSERDATA ) + { + pShaderResBinding = *GetUserData( L, CurrArg, m_ShaderResBindingMetatableName.c_str() ); + ++CurrArg; + } + } + + auto *pContext = EngineObjectParserBase::LoadDeviceContextFromRegistry( L ); + pContext->TransitionShaderResources( pPSO, pShaderResBinding ); + + return 0; + } + } diff --git a/RenderScript/src/DrawAttribsParser.cpp b/RenderScript/src/DrawAttribsParser.cpp index a1d9d3e..1c8a8c2 100644 --- a/RenderScript/src/DrawAttribsParser.cpp +++ b/RenderScript/src/DrawAttribsParser.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/RenderScript/src/EngineObjectParserBase.cpp b/RenderScript/src/EngineObjectParserBase.cpp index 5790e60..a1ac853 100644 --- a/RenderScript/src/EngineObjectParserBase.cpp +++ b/RenderScript/src/EngineObjectParserBase.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/RenderScript/src/EnumMappings.cpp b/RenderScript/src/EnumMappings.cpp index 3bc9349..33c87c1 100644 --- a/RenderScript/src/EnumMappings.cpp +++ b/RenderScript/src/EnumMappings.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. @@ -44,6 +44,7 @@ namespace Diligent TextureFormatEnumMapping::TextureFormatEnumMapping() { + DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEX_FORMAT_UNKNOWN ); DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEX_FORMAT_RGBA32_TYPELESS ); DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEX_FORMAT_RGBA32_FLOAT ); DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEX_FORMAT_RGBA32_UINT ); @@ -144,26 +145,27 @@ namespace Diligent DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEX_FORMAT_BC7_UNORM ); DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEX_FORMAT_BC7_UNORM_SRGB ); static_assert(TEX_FORMAT_NUM_FORMATS == TEX_FORMAT_BC7_UNORM_SRGB + 1, "Not all texture formats initialized."); - VERIFY( m_Str2ValMap.size() == TEX_FORMAT_NUM_FORMATS - 1, + VERIFY( m_Str2ValMap.size() == TEX_FORMAT_NUM_FORMATS, "Unexpected map size. Did you update TEXTURE_FORMAT enum?" ); - VERIFY( m_Val2StrMap.size() == TEX_FORMAT_NUM_FORMATS - 1, + VERIFY( m_Val2StrMap.size() == TEX_FORMAT_NUM_FORMATS, "Unexpected map size. Did you update TEXTURE_FORMAT enum?" ); } - TextureTypeEnumMapping::TextureTypeEnumMapping() + ResourceDimEnumMapping::ResourceDimEnumMapping() { - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_1D ); - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_1D_ARRAY ); - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_2D ); - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_2D_ARRAY ); - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_3D ); - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_CUBE ); - DEFINE_ENUM_ELEMENT_MAPPING( (*this), TEXTURE_TYPE_CUBE_ARRAY ); - static_assert(TEXTURE_TYPE_NUM_TYPES == TEXTURE_TYPE_CUBE_ARRAY + 1, "Not all texture types initialized."); - VERIFY( m_Str2ValMap.size() == TEXTURE_TYPE_NUM_TYPES - 1, - "Unexpected map size. Did you update TEXTURE_TYPE enum?" ); - VERIFY( m_Val2StrMap.size() == TEXTURE_TYPE_NUM_TYPES - 1, - "Unexpected map size. Did you update TEXTURE_TYPE enum?" ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_BUFFER ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_1D ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_1D_ARRAY ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_2D ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_2D_ARRAY ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_3D ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_CUBE ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), RESOURCE_DIM_TEX_CUBE_ARRAY ); + static_assert(RESOURCE_DIM_NUM_DIMENSIONS == RESOURCE_DIM_TEX_CUBE_ARRAY + 1, "Not all texture types initialized."); + VERIFY( m_Str2ValMap.size() == RESOURCE_DIM_NUM_DIMENSIONS - 1, + "Unexpected map size. Did you update RESOURCE_DIMENSION enum?" ); + VERIFY( m_Val2StrMap.size() == RESOURCE_DIM_NUM_DIMENSIONS - 1, + "Unexpected map size. Did you update RESOURCE_DIMENSION enum?" ); } ValueTypeEnumMapping::ValueTypeEnumMapping() @@ -207,4 +209,15 @@ namespace Diligent DEFINE_ENUM_ELEMENT_MAPPING( (*this), BIND_SHADER_RESOURCES_UPDATE_UNRESOLVED ); DEFINE_ENUM_ELEMENT_MAPPING( (*this), BIND_SHADER_RESOURCES_ALL_RESOLVED ); } + + ShaderTypeEnumMapping::ShaderTypeEnumMapping() + { + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_UNKNOWN ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_VERTEX ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_PIXEL ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_GEOMETRY ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_HULL ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_DOMAIN ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_TYPE_COMPUTE ); + } } diff --git a/RenderScript/src/InputLayoutDescParser.cpp b/RenderScript/src/InputLayoutDescParser.cpp new file mode 100644 index 0000000..b063c55 --- /dev/null +++ b/RenderScript/src/InputLayoutDescParser.cpp @@ -0,0 +1,87 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#include "pch.h" +#include "InputLayoutDescParser.h" + +namespace Diligent +{ + MemberBinder :: MemberBinder( size_t InputLayoutOffset, size_t ElementsBufferOffset ) : + MemberBinderBase( InputLayoutOffset ), + m_LayoutElementsBufferOffset(ElementsBufferOffset) + { + DEFINE_BINDER( m_Bindings, LayoutElement, InputIndex, Uint32, Validator( "Input Index", 0, 32 ) ) + DEFINE_BINDER( m_Bindings, LayoutElement, BufferSlot, Uint32, Validator( "Buffer Slot", 0, MaxBufferSlots ) ) + DEFINE_BINDER( m_Bindings, LayoutElement, NumComponents, Uint32, Validator( "Num Components", 1, 4 ) ) + + DEFINE_ENUM_BINDER( m_Bindings, LayoutElement, ValueType, VALUE_TYPE, m_ValueTypeEnumMapping ) + + DEFINE_BINDER( m_Bindings, LayoutElement, IsNormalized, Bool, Validator() ) + DEFINE_BINDER( m_Bindings, LayoutElement, RelativeOffset, Uint32, Validator() ) + + + m_FrequencyEnumMapping.AddMapping( "FREQUENCY_PER_VERTEX", LayoutElement::FREQUENCY_PER_VERTEX ); + m_FrequencyEnumMapping.AddMapping( "FREQUENCY_PER_INSTANCE", LayoutElement::FREQUENCY_PER_INSTANCE ); + VERIFY( m_FrequencyEnumMapping.m_Str2ValMap.size() == LayoutElement::FREQUENCY_NUM_FREQUENCIES - 1, + "Unexpected map size. Did you update LayoutElement::FREQUENCY_PER_VERTEX enum?" ); + VERIFY( m_FrequencyEnumMapping.m_Val2StrMap.size() == LayoutElement::FREQUENCY_NUM_FREQUENCIES - 1, + "Unexpected map size. Did you update LayoutElement::FREQUENCY_PER_VERTEX enum?" ); + DEFINE_ENUM_BINDER( m_Bindings, LayoutElement, Frequency, LayoutElement::FREQUENCY, m_FrequencyEnumMapping ) + + DEFINE_BINDER( m_Bindings, LayoutElement, InstanceDataStepRate, Uint32, Validator() ) + } + + void MemberBinder :: GetValue( lua_State *L, const void* pBasePointer ) + { + // Use raw pointer to push the value to Lua because the buffer + // most likely does not exist + const auto &InputLayout = GetMemberByOffest(pBasePointer, m_MemberOffset); + PushLuaArray( L, InputLayout.LayoutElements, InputLayout.LayoutElements + InputLayout.NumElements, [&]( const LayoutElement &Elem ) + { + PushLuaTable( L, &Elem, m_Bindings ); + } + ); + } + + void MemberBinder :: SetValue( lua_State *L, int Index, void* pBasePointer ) + { + ParseLuaArray( L, Index, pBasePointer, [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) + { + VERIFY( pBasePointer == _pBasePointer, "Sanity check failed" ); + auto &Elements = GetMemberByOffest >( pBasePointer, m_LayoutElementsBufferOffset); + auto CurrIndex = Elements.size(); + if( CurrIndex != NewArrayIndex - 1 ) + SCRIPT_PARSING_ERROR( L, "Explicit array indices are not allowed in layout description. Provided index ", NewArrayIndex - 1, " conflicts with actual index ", CurrIndex, "." ); + Elements.resize( CurrIndex + 1 ); + ParseLuaTable( L, StackIndex, &(Elements)[CurrIndex], m_Bindings ); + if( Elements[CurrIndex].ValueType == VT_UNDEFINED ) + SCRIPT_PARSING_ERROR( L, "Valid value type must be specified for layout element #", CurrIndex ); + } + ); + + auto &ElementsBuffer = GetMemberByOffest >( pBasePointer, m_LayoutElementsBufferOffset ); + auto &InputLayout = GetMemberByOffest< InputLayoutDesc >( pBasePointer, m_MemberOffset ); + InputLayout.LayoutElements = ElementsBuffer.data(); + InputLayout.NumElements = static_cast( ElementsBuffer.size() ); + } +} diff --git a/RenderScript/src/LayoutDescParser.cpp b/RenderScript/src/LayoutDescParser.cpp deleted file mode 100644 index a5bbda1..0000000 --- a/RenderScript/src/LayoutDescParser.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#include "pch.h" -#include "LayoutDescParser.h" - -namespace std -{ - DEFINE_ENUM_HASH( Diligent::LayoutElement::FREQUENCY ) -} - -namespace Diligent -{ - const Char* LayoutDescParser::LayoutDescLibName = "LayoutDesc"; - - class LayoutElementLoader; // Used only as a template switch - - template<> - class MemberBinder : public MemberBinderBase - { - public: - MemberBinder( size_t LayoutElementsOffset, size_t ElementsBufferOffset, size_t NumElementsOffset ) : - MemberBinderBase( ElementsBufferOffset ), - m_LayoutElementsOffset(LayoutElementsOffset), - m_NumElementsOffset(NumElementsOffset) - { - DEFINE_BINDER( m_Bindings, LayoutElement, InputIndex, Uint32, Validator( "Input Index", 0, 32 ) ) - DEFINE_BINDER( m_Bindings, LayoutElement, BufferSlot, Uint32, Validator( "Buffer Slot", 0, MaxBufferSlots ) ) - DEFINE_BINDER( m_Bindings, LayoutElement, NumComponents, Uint32, Validator( "Num Components", 1, 4 ) ) - - DEFINE_ENUM_BINDER( m_Bindings, LayoutElement, ValueType, VALUE_TYPE, m_ValueTypeEnumMapping ) - - DEFINE_BINDER( m_Bindings, LayoutElement, IsNormalized, Bool, Validator() ) - DEFINE_BINDER( m_Bindings, LayoutElement, RelativeOffset, Uint32, Validator() ) - - - m_FrequencyEnumMapping.AddMapping( "FREQUENCY_PER_VERTEX", LayoutElement::FREQUENCY_PER_VERTEX ); - m_FrequencyEnumMapping.AddMapping( "FREQUENCY_PER_INSTANCE", LayoutElement::FREQUENCY_PER_INSTANCE ); - VERIFY( m_FrequencyEnumMapping.m_Str2ValMap.size() == LayoutElement::FREQUENCY_NUM_FREQUENCIES - 1, - "Unexpected map size. Did you update LayoutElement::FREQUENCY_PER_VERTEX enum?" ); - VERIFY( m_FrequencyEnumMapping.m_Val2StrMap.size() == LayoutElement::FREQUENCY_NUM_FREQUENCIES - 1, - "Unexpected map size. Did you update LayoutElement::FREQUENCY_PER_VERTEX enum?" ); - DEFINE_ENUM_BINDER( m_Bindings, LayoutElement, Frequency, LayoutElement::FREQUENCY, m_FrequencyEnumMapping ) - - DEFINE_BINDER( m_Bindings, LayoutElement, InstanceDataStepRate, Uint32, Validator() ) - } - - virtual void GetValue( lua_State *L, const void* pBasePointer ) - { - // Use raw pointer to push the value to Lua because the buffer - // most likely does not exist - const auto *Elements = GetMemberByOffest(pBasePointer, m_LayoutElementsOffset); - const auto &NumElements = GetMemberByOffest< Uint32 >( pBasePointer, m_NumElementsOffset ); - PushLuaArray( L, Elements, Elements + NumElements, [&]( const LayoutElement &Elem ) - { - PushLuaTable( L, &Elem, m_Bindings ); - } - ); - } - - virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) - { - ParseLuaArray( L, Index, pBasePointer, [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) - { - VERIFY( pBasePointer == _pBasePointer, "Sanity check failed" ); - auto &Elements = GetMemberByOffest >( pBasePointer, m_MemberOffset ); - auto CurrIndex = Elements.size(); - if( CurrIndex != NewArrayIndex - 1 ) - SCRIPT_PARSING_ERROR( L, "Explicit array indices are not allowed in layout description. Provided index ", NewArrayIndex - 1, " conflicts with actual index ", CurrIndex, "." ); - Elements.resize( CurrIndex + 1 ); - ParseLuaTable( L, StackIndex, &(Elements)[CurrIndex], m_Bindings ); - if( Elements[CurrIndex].ValueType == VT_UNDEFINED ) - SCRIPT_PARSING_ERROR( L, "Valid value type must be specified for layout element #", CurrIndex ); - } - ); - - auto &ElementsBuffer = GetMemberByOffest >( pBasePointer, m_MemberOffset ); - auto &LayoutElements = GetMemberByOffest< LayoutElement* >( pBasePointer, m_LayoutElementsOffset ); - auto &NumElements = GetMemberByOffest< Uint32 >( pBasePointer, m_NumElementsOffset ); - LayoutElements = ElementsBuffer.data(); - NumElements = static_cast( ElementsBuffer.size() ); - } - private: - BindingsMapType m_Bindings; - ValueTypeEnumMapping m_ValueTypeEnumMapping; - EnumMapping < LayoutElement::FREQUENCY > m_FrequencyEnumMapping; - size_t m_LayoutElementsOffset; - size_t m_NumElementsOffset; - }; - - LayoutDescParser::LayoutDescParser( IRenderDevice *pRenderDevice, lua_State *L ) : - EngineObjectParserCommon( pRenderDevice, L, LayoutDescLibName ), - m_SetInputLayoutBinding( this, L, "Context", "SetInputLayout", &LayoutDescParser::SetInputLayout ) - { - DEFINE_BUFFERED_STRING_BINDER( m_Bindings, LayoutDescWrapper, Name, NameBuffer ) - - auto *pLayoutElemBinder = - new MemberBinder( - offsetof(LayoutDescWrapper, LayoutElements), - offsetof(LayoutDescWrapper, ElementsBuffer), - offsetof(LayoutDescWrapper, NumElements) - ); - m_Bindings.insert( std::make_pair( "LayoutElements", std::unique_ptr(pLayoutElemBinder) ) ); - }; - - void LayoutDescParser::CreateObj( lua_State *L ) - { - INIT_LUA_STACK_TRACKING( L ); - - LayoutDescWrapper LayoutDesc; - ParseLuaTable( L, -2, &LayoutDesc, m_Bindings ); - CHECK_LUA_STACK_HEIGHT(); - - auto ppVertexShader = GetUserData( L, -1, "Metatables.Shader" ); - auto ppVertDesc = reinterpret_cast(lua_newuserdata( L, sizeof( IVertexDescription* ) )); - *ppVertDesc = nullptr; - m_pRenderDevice->CreateVertexDescription( LayoutDesc, *ppVertexShader, ppVertDesc ); - if( *ppVertDesc == nullptr ) - SCRIPT_PARSING_ERROR(L, "Failed to create vertex description") - - CHECK_LUA_STACK_HEIGHT( +1 ); - } - - int LayoutDescParser::SetInputLayout( lua_State *L ) - { - auto pVertDesc = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); - auto *pContext = LoadDeviceContextFromRegistry( L ); - pContext->SetVertexDescription( pVertDesc ); - return 0; - } -} diff --git a/RenderScript/src/LuaBindings.cpp b/RenderScript/src/LuaBindings.cpp index 707a33c..9217b67 100644 --- a/RenderScript/src/LuaBindings.cpp +++ b/RenderScript/src/LuaBindings.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/RenderScript/src/LuaFunctionBinding.cpp b/RenderScript/src/LuaFunctionBinding.cpp index d81634e..a3a3dd1 100644 --- a/RenderScript/src/LuaFunctionBinding.cpp +++ b/RenderScript/src/LuaFunctionBinding.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/RenderScript/src/LuaWrappers.cpp b/RenderScript/src/LuaWrappers.cpp index 939fdac..1a0e119 100644 --- a/RenderScript/src/LuaWrappers.cpp +++ b/RenderScript/src/LuaWrappers.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/RenderScript/src/PSODescParser.cpp b/RenderScript/src/PSODescParser.cpp new file mode 100644 index 0000000..9f00f95 --- /dev/null +++ b/RenderScript/src/PSODescParser.cpp @@ -0,0 +1,257 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#include "pch.h" +#include "PSODescParser.h" +#include "BlendStateDescParser.h" +#include "RasterizerStateDescParser.h" +#include "DepthStencilStateDescParser.h" +#include "InputLayoutDescParser.h" + +namespace std +{ + DEFINE_ENUM_HASH( Diligent::PRIMITIVE_TOPOLOGY_TYPE ) +} + +namespace Diligent +{ + class RTVFormatsParser; + + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t /*MemberOffset*/, size_t /*Dummy*/ ) : + // We will use a pointer to the GraphicsPipelineDesc structure itself + MemberBinderBase( 0 ), + m_TexFmtLoader(0, "RTVFormats", m_TexFmtEnumMapping) + { + } + + virtual void GetValue( lua_State *L, const void* pBasePointer )override + { + const auto &GraphicsPipeline = GetMemberByOffest< GraphicsPipelineDesc >(pBasePointer, m_MemberOffset); + PushLuaArray( L, GraphicsPipeline.RTVFormats, GraphicsPipeline.RTVFormats + GraphicsPipeline.NumRenderTargets, [&]( const TEXTURE_FORMAT &Fmt ) + { + m_TexFmtLoader.GetValue(L, &Fmt); + }); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override + { + auto &GraphicsPipeline = GetMemberByOffest< GraphicsPipelineDesc >( pBasePointer, m_MemberOffset ); + if(lua_type(L,Index) == LUA_TTABLE) + { + ParseLuaArray( L, Index, pBasePointer, [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) + { + // Lua array indices are 1-based + NewArrayIndex -= 1; + VERIFY( pBasePointer == _pBasePointer, "Sanity check failed" ); + if( NewArrayIndex < 0 || NewArrayIndex >= MaxRenderTargets ) + SCRIPT_PARSING_ERROR( L, "Render target array index ", NewArrayIndex," is out of allowed range [", 0, ' ', MaxRenderTargets-1, ']' ); + + m_TexFmtLoader.SetValue(L, StackIndex, &GraphicsPipeline.RTVFormats[NewArrayIndex]); + GraphicsPipeline.NumRenderTargets = std::max(GraphicsPipeline.NumRenderTargets, static_cast(NewArrayIndex+1)); + } + ); + } + else if(lua_type(L,Index) == LUA_TSTRING) + { + m_TexFmtLoader.SetValue(L, Index, &GraphicsPipeline.RTVFormats[0]); + GraphicsPipeline.NumRenderTargets = 1; + } + else + { + SCRIPT_PARSING_ERROR( L, "Unexpected type ", lua_typename(L, Index), ". Table of strings or a string are expected" ); + } + } + private: + TextureFormatEnumMapping m_TexFmtEnumMapping; + EnumMemberBinder m_TexFmtLoader; + }; + + + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + DEFINE_BINDER( m_Bindings, SampleDesc, Count, Uint32, Validator("Count", 1,32) ); + DEFINE_BINDER( m_Bindings, SampleDesc, Quality, Uint32, Validator("Quality", 0,std::numeric_limits::max()) ); + } + + virtual void GetValue( lua_State *L, const void* pBasePointer )override + { + const auto &SmplDesc = GetMemberByOffest< SampleDesc >(pBasePointer, m_MemberOffset); + PushLuaTable(L, &SmplDesc, m_Bindings); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override + { + auto &SmplDesc = GetMemberByOffest< SampleDesc >( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &SmplDesc, m_Bindings ); + } + + private: + BindingsMapType m_Bindings; + }; + + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + std::vector AllowedMetatable = { "Metatables.Shader" }; + + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, pVS, EngineObjectPtrLoader, AllowedMetatable ); + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, pPS, EngineObjectPtrLoader, AllowedMetatable ); + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, pDS, EngineObjectPtrLoader, AllowedMetatable ); + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, pHS, EngineObjectPtrLoader, AllowedMetatable ); + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, pGS, EngineObjectPtrLoader, AllowedMetatable ); + + //D3D12_STREAM_OUTPUT_DESC StreamOutput; + + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, BlendDesc, BlendStateDesc, 0 ) + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, SampleMask, Uint32, Validator() ) + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, RasterizerDesc, RasterizerStateDesc, 0 ) + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, DepthStencilDesc, DepthStencilStateDesc, 0 ) + + auto *pLayoutElemBinder = + new MemberBinder( + offsetof(GraphicsPipelineDesc, InputLayout), + offsetof(PSODescParser::PSODescWrapper, LayoutElementsBuffer) - offsetof(PSODescParser::PSODescWrapper, GraphicsPipeline) + ); + m_Bindings.insert( std::make_pair( "InputLayout", std::unique_ptr(pLayoutElemBinder) ) ); + + //D3D12_INDEX_BUFFER_STRIP_CUT_VALUE IBStripCutValue; + + DEFINE_ENUM_ELEMENT_MAPPING( m_PrimTopologyTypeEnumMapping, PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED ); + DEFINE_ENUM_ELEMENT_MAPPING( m_PrimTopologyTypeEnumMapping, PRIMITIVE_TOPOLOGY_TYPE_POINT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_PrimTopologyTypeEnumMapping, PRIMITIVE_TOPOLOGY_TYPE_LINE ); + DEFINE_ENUM_ELEMENT_MAPPING( m_PrimTopologyTypeEnumMapping, PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE ); + DEFINE_ENUM_ELEMENT_MAPPING( m_PrimTopologyTypeEnumMapping, PRIMITIVE_TOPOLOGY_TYPE_PATCH ); + VERIFY( m_PrimTopologyTypeEnumMapping.m_Str2ValMap.size() == PRIMITIVE_TOPOLOGY_TYPE_NUM_TYPES, + "Unexpected map size. Did you update PRIMITIVE_TOPOLOGY_TYPE enum?" ); + VERIFY( m_PrimTopologyTypeEnumMapping.m_Val2StrMap.size() == PRIMITIVE_TOPOLOGY_TYPE_NUM_TYPES, + "Unexpected map size. Did you update PRIMITIVE_TOPOLOGY_TYPE enum?" ); + DEFINE_ENUM_BINDER( m_Bindings, GraphicsPipelineDesc, PrimitiveTopologyType, PRIMITIVE_TOPOLOGY_TYPE, m_PrimTopologyTypeEnumMapping ); + + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, RTVFormats, RTVFormatsParser, 0 ); + DEFINE_ENUM_BINDER( m_Bindings, GraphicsPipelineDesc, DSVFormat, TEXTURE_FORMAT, m_TexFmtEnumMapping ); + + DEFINE_BINDER( m_Bindings, GraphicsPipelineDesc, SmplDesc, SampleDesc, 0 ); + + //Uint32 NodeMask; + } + + virtual void GetValue( lua_State *L, const void* pBasePointer )override + { + const auto &GraphicsPipeline = GetMemberByOffest< GraphicsPipelineDesc >(pBasePointer, m_MemberOffset); + PushLuaTable(L, &GraphicsPipeline, m_Bindings); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override + { + auto &GraphicsPipeline = GetMemberByOffest< GraphicsPipelineDesc >( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &GraphicsPipeline, m_Bindings ); + } + private: + TextureFormatEnumMapping m_TexFmtEnumMapping; + EnumMapping < PRIMITIVE_TOPOLOGY_TYPE > m_PrimTopologyTypeEnumMapping; + BindingsMapType m_Bindings; + }; + + + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase( MemberOffset ) + { + std::vector AllowedMetatable = { "Metatables.Shader" }; + DEFINE_BINDER( m_Bindings, ComputePipelineDesc, pCS, EngineObjectPtrLoader, AllowedMetatable ); + } + + virtual void GetValue( lua_State *L, const void* pBasePointer )override + { + const auto &ComputePipeline = GetMemberByOffest< ComputePipelineDesc >(pBasePointer, m_MemberOffset); + PushLuaTable(L, &ComputePipeline, m_Bindings); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override + { + auto &ComputePipeline = GetMemberByOffest< ComputePipelineDesc >( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &ComputePipeline, m_Bindings ); + } + private: + BindingsMapType m_Bindings; + }; + + + const Char* PSODescParser::PSODescLibName = "PipelineState"; + PSODescParser::PSODescParser( IRenderDevice *pRenderDevice, lua_State *L ) : + EngineObjectParserCommon( pRenderDevice, L, PSODescLibName ), + m_SetPSOBinding( this, L, "Context", "SetPipelineState", &PSODescParser::SetPSO ) + { + DEFINE_BUFFERED_STRING_BINDER( m_Bindings, PSODescWrapper, Name, NameBuffer ) + + DEFINE_BINDER( m_Bindings, PSODescWrapper, IsComputePipeline, Bool, Validator() ) + DEFINE_BINDER( m_Bindings, PSODescWrapper, SRBAllocationGranularity, Uint32, Validator("SRBAllocationGranularity", 1, 65536) ) + + DEFINE_BINDER( m_Bindings, PSODescWrapper, GraphicsPipeline, GraphicsPipelineDesc, 0 ) + DEFINE_BINDER( m_Bindings, PSODescWrapper, ComputePipeline, ComputePipelineDesc, 0 ) + }; + + void PSODescParser::CreateObj( lua_State *L ) + { + INIT_LUA_STACK_TRACKING( L ); + + PSODescWrapper PSODesc; + ParseLuaTable( L, 1, &PSODesc, m_Bindings ); + + CHECK_LUA_STACK_HEIGHT(); + + auto ppPSO = reinterpret_cast(lua_newuserdata( L, sizeof( IPipelineState* ) )); + *ppPSO = nullptr; + m_pRenderDevice->CreatePipelineState( PSODesc, ppPSO ); + if( *ppPSO == nullptr ) + SCRIPT_PARSING_ERROR( L, "Failed to create Pipeline State Object state object" ) + + CHECK_LUA_STACK_HEIGHT( +1 ); + } + + int PSODescParser::SetPSO( lua_State *L ) + { + auto *pPSO = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); + + auto *pContext = LoadDeviceContextFromRegistry( L ); + pContext->SetPipelineState( pPSO ); + + return 0; + } +} diff --git a/RenderScript/src/ParsingErrors.cpp b/RenderScript/src/ParsingErrors.cpp index bb78387..e3db2b0 100644 --- a/RenderScript/src/ParsingErrors.cpp +++ b/RenderScript/src/ParsingErrors.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/RenderScript/src/RasterizerStateDescParser.cpp b/RenderScript/src/RasterizerStateDescParser.cpp new file mode 100644 index 0000000..3032874 --- /dev/null +++ b/RenderScript/src/RasterizerStateDescParser.cpp @@ -0,0 +1,70 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#include "pch.h" +#include "RasterizerStateDescParser.h" + +namespace Diligent +{ + + MemberBinder::MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinderBase(MemberOffset) + { + DEFINE_ENUM_ELEMENT_MAPPING( m_FillModeEnumMapping, FILL_MODE_WIREFRAME ); + DEFINE_ENUM_ELEMENT_MAPPING( m_FillModeEnumMapping, FILL_MODE_SOLID ); + VERIFY( m_FillModeEnumMapping.m_Str2ValMap.size() == FILL_MODE_NUM_MODES-1, + "Unexpected map size. Did you update FILL_MODE enum?" ); + VERIFY( m_FillModeEnumMapping.m_Val2StrMap.size() == FILL_MODE_NUM_MODES-1, + "Unexpected map size. Did you update FILL_MODE enum?" ); + DEFINE_ENUM_BINDER( m_Bindings, RasterizerStateDesc, FillMode, FILL_MODE, m_FillModeEnumMapping ); + + DEFINE_ENUM_ELEMENT_MAPPING( m_CullModeEnumMapping, CULL_MODE_NONE ); + DEFINE_ENUM_ELEMENT_MAPPING( m_CullModeEnumMapping, CULL_MODE_FRONT ); + DEFINE_ENUM_ELEMENT_MAPPING( m_CullModeEnumMapping, CULL_MODE_BACK ); + VERIFY( m_CullModeEnumMapping.m_Str2ValMap.size() == CULL_MODE_NUM_MODES-1, + "Unexpected map size. Did you update CULL_MODE enum?" ); + VERIFY( m_CullModeEnumMapping.m_Val2StrMap.size() == CULL_MODE_NUM_MODES-1, + "Unexpected map size. Did you update CULL_MODE enum?" ); + DEFINE_ENUM_BINDER( m_Bindings, RasterizerStateDesc, CullMode, CULL_MODE, m_CullModeEnumMapping ); + + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, FrontCounterClockwise, Bool, Validator() ); + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, DepthBias, Int32, Validator() ); + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, DepthBiasClamp, Float32, Validator() ); + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, SlopeScaledDepthBias, Float32, Validator() ); + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, DepthClipEnable, Bool, Validator() ); + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, ScissorEnable, Bool, Validator() ); + DEFINE_BINDER( m_Bindings, RasterizerStateDesc, AntialiasedLineEnable, Bool, Validator() ); + }; + + void MemberBinder ::GetValue(lua_State *L, const void* pBasePointer) + { + const auto &RasterizerDesc = GetMemberByOffest< RasterizerStateDesc >(pBasePointer, m_MemberOffset); + PushLuaTable(L, &RasterizerDesc, m_Bindings); + } + + void MemberBinder ::SetValue(lua_State *L, int Index, void* pBasePointer) + { + auto &RasterizerDesc = GetMemberByOffest< RasterizerStateDesc>( pBasePointer, m_MemberOffset ); + ParseLuaTable( L, Index, &RasterizerDesc, m_Bindings ); + } +} diff --git a/RenderScript/src/RasterizerStateParser.cpp b/RenderScript/src/RasterizerStateParser.cpp deleted file mode 100644 index 1cac9ed..0000000 --- a/RenderScript/src/RasterizerStateParser.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* Copyright 2015 Egor Yusov - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. - * - * In no event and under no legal theory, whether in tort (including negligence), - * contract, or otherwise, unless required by applicable law (such as deliberate - * and grossly negligent acts) or agreed to in writing, shall any Contributor be - * liable for any damages, including any direct, indirect, special, incidental, - * or consequential damages of any character arising as a result of this License or - * out of the use or inability to use the software (including but not limited to damages - * for loss of goodwill, work stoppage, computer failure or malfunction, or any and - * all other commercial damages or losses), even if such Contributor has been advised - * of the possibility of such damages. - */ - -#include "pch.h" -#include "RasterizerStateParser.h" - - -namespace Diligent -{ - const Char* RasterizerStateParser::RasterizerStateLibName = "RasterizerState"; - - RasterizerStateParser::RasterizerStateParser( IRenderDevice *pRenderDevice, lua_State *L ) : - EngineObjectParserCommon( pRenderDevice, L, RasterizerStateLibName ), - m_SetRasterizerBinding( this, L, "Context", "SetRasterizerState", &RasterizerStateParser::SetRasterizerState ) - { - DEFINE_BUFFERED_STRING_BINDER( m_Bindings, SRSDescWrapper, Name, NameBuffer ) - - DEFINE_ENUM_ELEMENT_MAPPING( m_FillModeEnumMapping, FILL_MODE_WIREFRAME ); - DEFINE_ENUM_ELEMENT_MAPPING( m_FillModeEnumMapping, FILL_MODE_SOLID ); - VERIFY( m_FillModeEnumMapping.m_Str2ValMap.size() == FILL_MODE_NUM_MODES-1, - "Unexpected map size. Did you update FILL_MODE enum?" ); - VERIFY( m_FillModeEnumMapping.m_Val2StrMap.size() == FILL_MODE_NUM_MODES-1, - "Unexpected map size. Did you update FILL_MODE enum?" ); - DEFINE_ENUM_BINDER( m_Bindings, SRSDescWrapper, FillMode, FILL_MODE, m_FillModeEnumMapping ); - - DEFINE_ENUM_ELEMENT_MAPPING( m_CullModeEnumMapping, CULL_MODE_NONE ); - DEFINE_ENUM_ELEMENT_MAPPING( m_CullModeEnumMapping, CULL_MODE_FRONT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_CullModeEnumMapping, CULL_MODE_BACK ); - VERIFY( m_CullModeEnumMapping.m_Str2ValMap.size() == CULL_MODE_NUM_MODES-1, - "Unexpected map size. Did you update CULL_MODE enum?" ); - VERIFY( m_CullModeEnumMapping.m_Val2StrMap.size() == CULL_MODE_NUM_MODES-1, - "Unexpected map size. Did you update CULL_MODE enum?" ); - DEFINE_ENUM_BINDER( m_Bindings, SRSDescWrapper, CullMode, CULL_MODE, m_CullModeEnumMapping ); - - DEFINE_BINDER( m_Bindings, SRSDescWrapper, FrontCounterClockwise, Bool, Validator() ); - DEFINE_BINDER( m_Bindings, SRSDescWrapper, DepthBias, Int32, Validator() ); - DEFINE_BINDER( m_Bindings, SRSDescWrapper, DepthBiasClamp, Float32, Validator() ); - DEFINE_BINDER( m_Bindings, SRSDescWrapper, SlopeScaledDepthBias, Float32, Validator() ); - DEFINE_BINDER( m_Bindings, SRSDescWrapper, DepthClipEnable, Bool, Validator() ); - DEFINE_BINDER( m_Bindings, SRSDescWrapper, ScissorEnable, Bool, Validator() ); - DEFINE_BINDER( m_Bindings, SRSDescWrapper, AntialiasedLineEnable, Bool, Validator() ); - }; - - void RasterizerStateParser::CreateObj( lua_State *L ) - { - INIT_LUA_STACK_TRACKING( L ); - - SRSDescWrapper RasterizerDesc; - ParseLuaTable( L, 1, &RasterizerDesc, m_Bindings ); - - CHECK_LUA_STACK_HEIGHT(); - - auto ppRasterizerState = reinterpret_cast(lua_newuserdata( L, sizeof( IRasterizerState* ) )); - *ppRasterizerState = nullptr; - m_pRenderDevice->CreateRasterizerState( RasterizerDesc, ppRasterizerState ); - if( *ppRasterizerState == nullptr ) - SCRIPT_PARSING_ERROR(L, "Failed to create rasterizer state") - - CHECK_LUA_STACK_HEIGHT( +1 ); - } - - int RasterizerStateParser::SetRasterizerState( lua_State *L ) - { - auto *pRS = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); - auto *pContext = LoadDeviceContextFromRegistry( L ); - pContext->SetRasterizerState( pRS ); - return 0; - } -} diff --git a/RenderScript/src/ResourceMappingParser.cpp b/RenderScript/src/ResourceMappingParser.cpp index e3f4918..558685e 100644 --- a/RenderScript/src/ResourceMappingParser.cpp +++ b/RenderScript/src/ResourceMappingParser.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. @@ -36,7 +36,6 @@ namespace Diligent BufferParser *pBuffParser, BufferViewParser *pBuffViewParser ) : EngineObjectParserBase( pRenderDevice, L, ResourceMappingLibName), - m_BindShaderResourcesBinding( this, L, "Context", "BindShaderResources", &ResourceMappingParser::BindShaderResources ), m_pTexViewParser( pTexViewParser ), m_pBuffParser( pBuffParser ), m_pBuffViewParser( pBuffViewParser ), @@ -131,25 +130,6 @@ namespace Diligent } } - int ResourceMappingParser::BindShaderResources( lua_State *L ) - { - auto *pContext = LoadDeviceContextFromRegistry( L ); - auto pResMapping = *GetUserData( L, 1, m_MetatableRegistryName.c_str() ); - Uint32 Flags = 0; - auto NumArgs = lua_gettop( L ); - // The last argument may be flags - const int FlagsArgInd = 2; - if( NumArgs >= FlagsArgInd && - (lua_type( L, FlagsArgInd ) == LUA_TSTRING || lua_type( L, FlagsArgInd ) == LUA_TTABLE ) ) - { - FlagsLoader FlagsLoader(0, "BindShaderResourceFlags", m_BindShaderResFlagEnumMapping); - FlagsLoader.SetValue( L, FlagsArgInd, &Flags ); - } - - pContext->BindShaderResources( pResMapping, Flags ); - return 0; - } - void ResourceMappingParser::GetObjectByName( lua_State *L, const Char *ShaderName, IResourceMapping** ppObject ) { auto pObject = *GetGlobalObject( L, ShaderName, m_MetatableRegistryName.c_str() ); diff --git a/RenderScript/src/SamplerParser.cpp b/RenderScript/src/SamplerParser.cpp index 74aa71f..864a5df 100644 --- a/RenderScript/src/SamplerParser.cpp +++ b/RenderScript/src/SamplerParser.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. @@ -33,43 +33,7 @@ namespace Diligent { DEFINE_BUFFERED_STRING_BINDER( m_Bindings, SSamDescWrapper, Name, NameBuffer ) - DEFINE_ENUM_ELEMENT_MAPPING( m_FilterTypeEnumMapping, FILTER_TYPE_POINT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_FilterTypeEnumMapping, FILTER_TYPE_LINEAR ); - DEFINE_ENUM_ELEMENT_MAPPING( m_FilterTypeEnumMapping, FILTER_TYPE_ANISOTROPIC ); - DEFINE_ENUM_ELEMENT_MAPPING( m_FilterTypeEnumMapping, FILTER_TYPE_COMPARISON_POINT ); - DEFINE_ENUM_ELEMENT_MAPPING( m_FilterTypeEnumMapping, FILTER_TYPE_COMPARISON_LINEAR ); - DEFINE_ENUM_ELEMENT_MAPPING( m_FilterTypeEnumMapping, FILTER_TYPE_COMPARISON_ANISOTROPIC ); - VERIFY( m_FilterTypeEnumMapping.m_Str2ValMap.size() == FILTER_TYPE_NUM_FILTERS - 1, "Unexpected map size. Did you update FILTER_TYPE enum?" ); - VERIFY( m_FilterTypeEnumMapping.m_Val2StrMap.size() == FILTER_TYPE_NUM_FILTERS - 1, "Unexpected map size. Did you update FILTER_TYPE enum?" ); - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, MinFilter, FILTER_TYPE, m_FilterTypeEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, MagFilter, FILTER_TYPE, m_FilterTypeEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, MipFilter, FILTER_TYPE, m_FilterTypeEnumMapping ) - - - DEFINE_ENUM_ELEMENT_MAPPING( m_TexAddrModeEnumMapping, TEXTURE_ADDRESS_WRAP ); - DEFINE_ENUM_ELEMENT_MAPPING( m_TexAddrModeEnumMapping, TEXTURE_ADDRESS_MIRROR ); - DEFINE_ENUM_ELEMENT_MAPPING( m_TexAddrModeEnumMapping, TEXTURE_ADDRESS_CLAMP ); - DEFINE_ENUM_ELEMENT_MAPPING( m_TexAddrModeEnumMapping, TEXTURE_ADDRESS_BORDER ); - DEFINE_ENUM_ELEMENT_MAPPING( m_TexAddrModeEnumMapping, TEXTURE_ADDRESS_MIRROR_ONCE ); - VERIFY( m_TexAddrModeEnumMapping.m_Str2ValMap.size() == TEXTURE_ADDRESS_NUM_MODES - 1, "Unexpected map size. Did you update TEXTURE_ADDRESS_MODE enum?" ); - VERIFY( m_TexAddrModeEnumMapping.m_Val2StrMap.size() == TEXTURE_ADDRESS_NUM_MODES - 1, "Unexpected map size. Did you update TEXTURE_ADDRESS_MODE enum?" ); - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, AddressU, TEXTURE_ADDRESS_MODE, m_TexAddrModeEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, AddressV, TEXTURE_ADDRESS_MODE, m_TexAddrModeEnumMapping ) - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, AddressW, TEXTURE_ADDRESS_MODE, m_TexAddrModeEnumMapping ) - - - Validator DummyValidatorF( SkipValidationFunc ); - DEFINE_BINDER( m_Bindings, SSamDescWrapper, MipLODBias, Float32, DummyValidatorF ) - - Validator MaxAnisotropyValidator( "Max Anisotropy", 0, 32 ); - DEFINE_BINDER( m_Bindings, SSamDescWrapper, MaxAnisotropy, Uint32, MaxAnisotropyValidator ) - - DEFINE_ENUM_BINDER( m_Bindings, SSamDescWrapper, ComparisonFunc, COMPARISON_FUNCTION, m_CmpFuncEnumMapping ) - - DEFINE_BINDER( m_Bindings, SSamDescWrapper, BorderColor, RGBALoader, 0 ) - - DEFINE_BINDER( m_Bindings, SSamDescWrapper, MinLOD, Float32, DummyValidatorF ) - DEFINE_BINDER( m_Bindings, SSamDescWrapper, MaxLOD, Float32, DummyValidatorF ) + InitSamplerParserBindings(m_Bindings, m_FilterTypeEnumMapping, m_TexAddrModeEnumMapping, m_CmpFuncEnumMapping); }; void SamplerParser::CreateObj( lua_State *L ) diff --git a/RenderScript/src/ScissorRectParser.cpp b/RenderScript/src/ScissorRectParser.cpp index 3f81087..dc573e4 100644 --- a/RenderScript/src/ScissorRectParser.cpp +++ b/RenderScript/src/ScissorRectParser.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/RenderScript/src/ScriptParser.cpp b/RenderScript/src/ScriptParser.cpp index 3331eac..6147f1b 100644 --- a/RenderScript/src/ScriptParser.cpp +++ b/RenderScript/src/ScriptParser.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. @@ -25,7 +25,6 @@ #include "ScriptParser.h" #include "LuaBindings.h" #include "SamplerParser.h" -#include "LayoutDescParser.h" #include "ShaderParser.h" #include "BufferParser.h" #include "TextureParser.h" @@ -34,13 +33,12 @@ #include "ResourceMappingParser.h" #include "TextureViewParser.h" #include "BufferViewParser.h" -#include "DepthStencilStateParser.h" -#include "RasterizerStateParser.h" -#include "BlendStateParser.h" +#include "PSODescParser.h" #include "DeviceContextFuncBindings.h" #include "ViewportParser.h" #include "ScissorRectParser.h" #include "ShaderVariableParser.h" +#include "ShaderResourceBindingParser.h" using namespace Diligent; using namespace Diligent; @@ -61,17 +59,15 @@ namespace Diligent } IMPLEMENT_PUSH_FUNC_STUBS( ISampler, m_pSamplerParser) - IMPLEMENT_PUSH_FUNC_STUBS( IVertexDescription, m_pLayoutDescParser ) IMPLEMENT_PUSH_FUNC_STUBS( IShader, m_pShaderParser ) IMPLEMENT_PUSH_FUNC_STUBS( IBuffer, m_pBufferParser ) IMPLEMENT_PUSH_FUNC_STUBS( ITexture, m_pTextureParser ) IMPLEMENT_PUSH_FUNC_STUBS( IResourceMapping, m_pResourceMappingParser ) IMPLEMENT_PUSH_FUNC_STUBS( ITextureView, m_pTextureViewParser ) IMPLEMENT_PUSH_FUNC_STUBS( IBufferView, m_pBufferViewParser ) - IMPLEMENT_PUSH_FUNC_STUBS( IDepthStencilState, m_pDSStateParser ) - IMPLEMENT_PUSH_FUNC_STUBS( IRasterizerState, m_pRSParser ) - IMPLEMENT_PUSH_FUNC_STUBS( IBlendState, m_pBSParser ) + IMPLEMENT_PUSH_FUNC_STUBS( IPipelineState, m_pPSOParser ) IMPLEMENT_PUSH_FUNC_STUBS( IShaderVariable, m_pShaderVariableParser ) + IMPLEMENT_PUSH_FUNC_STUBS( IShaderResourceBinding, m_pShaderResBindingParser ) void ScriptParser::SpecialPushFuncs::PushFuncStub( lua_State *L, const DrawAttribs &DrawAttribs ) @@ -103,7 +99,6 @@ namespace Diligent DefineGlobalConstants(m_LuaState); m_pSamplerParser.reset( new SamplerParser( pRenderDevice, m_LuaState ) ); - m_pLayoutDescParser.reset( new LayoutDescParser( pRenderDevice, m_LuaState ) ); m_pBufferParser.reset( new BufferParser( pRenderDevice, m_LuaState ) ); m_pTextureParser.reset( new TextureParser( pRenderDevice, m_LuaState ) ); m_pDrawAttribsParser.reset( new DrawAttribsParser( m_pBufferParser.get(), pRenderDevice, m_LuaState ) ); @@ -113,13 +108,12 @@ namespace Diligent m_pBufferViewParser.reset( new BufferViewParser( m_pBufferParser.get(), pRenderDevice, m_LuaState ) ); m_pResourceMappingParser.reset( new ResourceMappingParser( pRenderDevice, m_LuaState, m_pTextureViewParser.get(), m_pBufferParser.get(), m_pBufferViewParser.get() ) ); m_pShaderParser.reset( new ShaderParser( pRenderDevice, m_LuaState, m_pResourceMappingParser->GetMetatableName() ) ); - m_pDSStateParser.reset( new DepthStencilStateParser( pRenderDevice, m_LuaState ) ); - m_pRSParser.reset( new RasterizerStateParser( pRenderDevice, m_LuaState ) ); - m_pBSParser.reset( new BlendStateParser( pRenderDevice, m_LuaState ) ); - m_pDeviceCtxFuncBindings.reset( new DeviceContextFuncBindings( pRenderDevice, m_LuaState, m_pTextureViewParser.get() ) ); + m_pPSOParser.reset( new PSODescParser( pRenderDevice, m_LuaState ) ); m_pViewportParser.reset( new ViewportParser( pRenderDevice, m_LuaState ) ); m_pScissorRectParser.reset( new ScissorRectParser( pRenderDevice, m_LuaState ) ); m_pShaderVariableParser.reset( new ShaderVariableParser( pRenderDevice, m_LuaState, m_pShaderParser->GetMetatableName(), m_pBufferParser->GetMetatableName(), m_pBufferViewParser->GetMetatableName(), m_pTextureViewParser->GetMetatableName() ) ); + m_pShaderResBindingParser.reset( new ShaderResourceBindingParser( pRenderDevice, m_LuaState, m_pPSOParser->GetMetatableName(), m_pResourceMappingParser->GetMetatableName(), m_pShaderVariableParser->GetMetatableName() ) ); + m_pDeviceCtxFuncBindings.reset( new DeviceContextFuncBindings( pRenderDevice, m_LuaState, m_pTextureViewParser.get(), m_pShaderResBindingParser.get(), m_pPSOParser.get() ) ); } ScriptParser::~ScriptParser() @@ -148,8 +142,12 @@ namespace Diligent pDeviceStr = "OpenGLES"; break; - case DeviceType::DirectX: - pDeviceStr = "DirectX"; + case DeviceType::D3D11: + pDeviceStr = "D3D11"; + break; + + case DeviceType::D3D12: + pDeviceStr = "D3D12"; break; default: @@ -201,11 +199,6 @@ namespace Diligent m_pSamplerParser->GetObjectByName( m_LuaState, SamplerName, ppSampler ); } - void ScriptParser::GetVertexDescriptionByName( const Char *VertDescName, IVertexDescription** ppVertDesc ) - { - m_pLayoutDescParser->GetObjectByName( m_LuaState, VertDescName, ppVertDesc ); - } - void ScriptParser::GetShaderByName( const Char *ShaderName, IShader** ppShader ) { m_pShaderParser->GetObjectByName( m_LuaState, ShaderName, ppShader ); @@ -236,19 +229,9 @@ namespace Diligent m_pBufferViewParser->GetObjectByName( m_LuaState, BufferViewName, ppBufferView ); } - void ScriptParser::GetDepthStencilStateByName( const Char *DepthStencilStateName, IDepthStencilState** ppDepthStencilState ) - { - m_pDSStateParser->GetObjectByName( m_LuaState, DepthStencilStateName, ppDepthStencilState ); - } - - void ScriptParser::GetRasterizerStateByName( const Char *RasterizerStateName, IRasterizerState** ppRasterizerState ) - { - m_pRSParser->GetObjectByName( m_LuaState, RasterizerStateName, ppRasterizerState ); - } - - void ScriptParser::GetBlendStateByName( const Char *BlendStateName, IBlendState** ppBlendState ) + void ScriptParser::GetPipelineStateByName( const Char *PSOName, IPipelineState** ppPSO ) { - m_pBSParser->GetObjectByName( m_LuaState, BlendStateName, ppBlendState ); + m_pPSOParser->GetObjectByName( m_LuaState, PSOName, ppPSO ); } void ScriptParser::GetShaderVariableByName( const Char *ShaderVarName, IShaderVariable** ppShaderVar ) diff --git a/RenderScript/src/ShaderParser.cpp b/RenderScript/src/ShaderParser.cpp index 38bdee3..de85150 100644 --- a/RenderScript/src/ShaderParser.cpp +++ b/RenderScript/src/ShaderParser.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. @@ -24,23 +24,261 @@ #include "pch.h" #include "ShaderParser.h" #include "BasicShaderSourceStreamFactory.h" +#include "SamplerParser.h" + namespace std { - DEFINE_ENUM_HASH( Diligent::SHADER_TYPE ) + DEFINE_ENUM_HASH( Diligent::SHADER_VARIABLE_TYPE ) } namespace Diligent { const Char* ShaderParser::ShaderLibName = "Shader"; + + class ShaderVariableTypeEnumMapping : public EnumMapping < Diligent::SHADER_VARIABLE_TYPE > + { + public: + ShaderVariableTypeEnumMapping() + { + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_VARIABLE_TYPE_STATIC ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_VARIABLE_TYPE_MUTABLE ); + DEFINE_ENUM_ELEMENT_MAPPING( (*this), SHADER_VARIABLE_TYPE_DYNAMIC ); + } + }; + + class ShaderVariableDescArrayParser; + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t VariableDescOffset, + size_t NumVariablesOffset, + size_t VarDescBufferOffset, + size_t VarNamesBufferOffset ) : + MemberBinderBase( VariableDescOffset ), + m_NumVariablesOffset(NumVariablesOffset), + m_VarDescBufferOffset(VarDescBufferOffset), + m_VarNamesBufferOffset(VarNamesBufferOffset) + { + DEFINE_ENUM_BINDER( m_Bindings, ShaderVariableDesc, Type, SHADER_VARIABLE_TYPE, m_ShaderVarTypeEnumMapping ) + } + + virtual void GetValue( lua_State *L, const void* pBasePointer )override + { + // Use raw pointer to push the value to Lua because the buffer + // most likely does not exist + const auto &VarDesc = GetMemberByOffest( pBasePointer, m_MemberOffset); + const auto &NumVars = GetMemberByOffest( pBasePointer, m_NumVariablesOffset); + + PushLuaArray( L, VarDesc, VarDesc + NumVars, [&]( const ShaderVariableDesc &VarDesc ) + { + // Push variable type. The function will leave the new table on top + // of the stack + PushLuaTable( L, &VarDesc, m_Bindings ); // Stack: +1 + + // Push name into the same table + lua_pushstring( L, "Name" ); // Stack: +2 + lua_pushstring( L, VarDesc.Name); // Stack: +3 + lua_settable( L, -3 ); // Stack: +1 + } + ); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) + { + auto &ShaderVarDescBuffer = GetMemberByOffest>( pBasePointer, m_VarDescBufferOffset); + auto &ShaderNamesBuffer = GetMemberByOffest>( pBasePointer, m_VarNamesBufferOffset); + + ParseLuaArray( L, Index, pBasePointer, + [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) + { + VERIFY_EXPR( pBasePointer == _pBasePointer ); + + auto CurrIndex = ShaderVarDescBuffer.size(); + if( CurrIndex != NewArrayIndex - 1 ) + SCRIPT_PARSING_ERROR( L, "Explicit array indices are not allowed in shader name description. Provided index ", NewArrayIndex - 1, " conflicts with actual index ", CurrIndex, "." ); + ShaderVarDescBuffer.resize( CurrIndex + 1 ); + ShaderNamesBuffer.resize( CurrIndex + 1 ); + ParseLuaTable( L, StackIndex, &(ShaderVarDescBuffer)[CurrIndex], + [&](int TblStackInd, void* __pBasePointer, const char *Key) + { + auto Binding = m_Bindings.find( Key ); + if( Binding != m_Bindings.end() ) + { + Binding->second->SetValue( L, TblStackInd, __pBasePointer ); + } + else if (strcmp(Key, "Name") == 0) + { + auto Name = ReadValueFromLua(L, TblStackInd); + ShaderNamesBuffer[CurrIndex] = Name; + } + else + { + SCRIPT_PARSING_ERROR( L, "Unknown Member \"", Key, '\"' ); + } + } + ); + + if( ShaderNamesBuffer[CurrIndex].length() == 0 ) + SCRIPT_PARSING_ERROR(L, "Missing shader variable name") + } + ); + + for(size_t v=0; v < ShaderVarDescBuffer.size(); ++v) + { + ShaderVarDescBuffer[v].Name = ShaderNamesBuffer[v].c_str(); + } + + auto &VarDesc = GetMemberByOffest( pBasePointer, m_MemberOffset); + auto &NumVars = GetMemberByOffest( pBasePointer, m_NumVariablesOffset); + NumVars = static_cast(ShaderVarDescBuffer.size()); + VarDesc = NumVars ? ShaderVarDescBuffer.data() : nullptr; + } + private: + BindingsMapType m_Bindings; + ShaderVariableTypeEnumMapping m_ShaderVarTypeEnumMapping; + ShaderTypeEnumMapping m_ShaderTypeEnumMapping; + size_t m_NumVariablesOffset; + size_t m_VarDescBufferOffset; + size_t m_VarNamesBufferOffset; + }; + + + class StaticSamplerDescArrayParser; + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder( size_t StaticSamplerDescOffset, + size_t NumStaticSamplersOffset, + size_t StaticSamplersBufferOffset, + size_t StaticSamplerTexNamesBufferOffset ) : + MemberBinderBase( StaticSamplerDescOffset ), + m_NumStaticSamplersOffset(NumStaticSamplersOffset), + m_StaticSamplersBufferOffset(StaticSamplersBufferOffset), + m_StaticSamplerTexNamesBufferOffset(StaticSamplerTexNamesBufferOffset) + { + InitSamplerParserBindings(m_Bindings, m_FilterTypeEnumMapping, m_TexAddrModeEnumMapping, m_CmpFuncEnumMapping); + } + + virtual void GetValue( lua_State *L, const void* pBasePointer )override + { + // Use raw pointer to push the value to Lua because the buffer + // most likely does not exist + const auto &StaticSamplers = GetMemberByOffest( pBasePointer, m_MemberOffset); + const auto &NumStaticSamplers = GetMemberByOffest( pBasePointer, m_NumStaticSamplersOffset); + + PushLuaArray( L, StaticSamplers, StaticSamplers + NumStaticSamplers, [&]( const StaticSamplerDesc &SamDesc ) + { + // Push new table to hold variables of StaticSamplerDesc struct + lua_newtable(L); // Stack: +1 + + // Push "Desc" field + lua_pushstring( L, "Desc" ); // Stack: +2 + // Push members of StaticSamplerDesc::Desc. The function will leave new table on top + // of the stack + PushLuaTable( L, &SamDesc.Desc, m_Bindings ); // Stack: +3 + // Push the table from the top into the parent table + lua_settable( L, -3 ); // Stack: +1 + + // Push "TextureName" field + lua_pushstring( L, "TextureName" ); // Stack: +2 + lua_pushstring( L, SamDesc.TextureName); // Stack: +3 + lua_settable( L, -3 ); // Stack: +1 + } + ); + } + + virtual void SetValue( lua_State *L, int Index, void* pBasePointer ) + { + auto &StaticSamplersBuffer = GetMemberByOffest>( pBasePointer, m_StaticSamplersBufferOffset); + auto &StaticSamplerTexNamesBuffer = GetMemberByOffest>( pBasePointer, m_StaticSamplerTexNamesBufferOffset); + + ParseLuaArray( L, Index, pBasePointer, + [&]( void* _pBasePointer, int StackIndex, int NewArrayIndex ) + { + VERIFY_EXPR( pBasePointer == _pBasePointer ); + + auto CurrIndex = StaticSamplersBuffer.size(); + if( CurrIndex != NewArrayIndex - 1 ) + SCRIPT_PARSING_ERROR( L, "Explicit array indices are not allowed in static sampler description. Provided index ", NewArrayIndex - 1, " conflicts with actual index ", CurrIndex, "." ); + StaticSamplersBuffer.resize( CurrIndex + 1 ); + StaticSamplerTexNamesBuffer.resize( CurrIndex + 1 ); + ParseLuaTable( L, StackIndex, &(StaticSamplersBuffer)[CurrIndex], + [&](int TblStackInd, void* __pBasePointer, const char *Key) + { + if (strcmp(Key, "Desc") == 0) + { + ParseLuaTable( L, StackIndex, &(StaticSamplersBuffer)[CurrIndex].Desc, + [&](int TblStackInd, void* __pBasePointer, const char *Key) + { + if (strcmp(Key, "Name") == 0) + { + UNSUPPORTED("Parsing of the static sampler name is not implemented") + } + else + { + auto Binding = m_Bindings.find( Key ); + if (Binding != m_Bindings.end()) + { + Binding->second->SetValue( L, TblStackInd, __pBasePointer ); + } + else + { + SCRIPT_PARSING_ERROR( L, "Unknown Member \"", Key, '\"' ); + } + } + } + ); + } + else if (strcmp(Key, "TextureName") == 0) + { + auto Name = ReadValueFromLua(L, TblStackInd); + StaticSamplerTexNamesBuffer[CurrIndex] = Name; + } + else + { + SCRIPT_PARSING_ERROR( L, "Unknown Member \"", Key, '\"' ); + } + } + ); + + if( StaticSamplerTexNamesBuffer[CurrIndex].length() == 0 ) + SCRIPT_PARSING_ERROR(L, "Missing static sampler texture name") + } + ); + + for(size_t v=0; v < StaticSamplersBuffer.size(); ++v) + { + StaticSamplersBuffer[v].TextureName = StaticSamplerTexNamesBuffer[v].c_str(); + } + + auto &StaticSamplers = GetMemberByOffest( pBasePointer, m_MemberOffset); + auto &NumStaticSamplers = GetMemberByOffest( pBasePointer, m_NumStaticSamplersOffset); + NumStaticSamplers = static_cast(StaticSamplersBuffer.size()); + StaticSamplers = NumStaticSamplers ? StaticSamplersBuffer.data() : nullptr; + } + private: + BindingsMapType m_Bindings; + EnumMapping m_FilterTypeEnumMapping; + EnumMapping m_TexAddrModeEnumMapping; + ComparisonFuncEnumMapping m_CmpFuncEnumMapping; + + size_t m_NumStaticSamplersOffset; + size_t m_StaticSamplersBufferOffset; + size_t m_StaticSamplerTexNamesBufferOffset; + }; + + class ShaderDescLoader; template<> class MemberBinder : public MemberBinderBase { public: - MemberBinder( size_t MemberOffset, size_t Dummy ) : + MemberBinder( size_t MemberOffset, size_t VarDescBufferOffset, size_t VarNamesBufferOffset, size_t StaticSamplersBufferOffset, size_t StaticSamplerTexNamesBufferOffset ) : MemberBinderBase( MemberOffset ) { auto *pNameBinder = new BufferedStringBinder( offsetof( ShaderDesc, Name ), @@ -51,14 +289,27 @@ namespace Diligent // keep pointer to it m_Bindings.insert( std::make_pair( "Name", std::unique_ptr(pNameBinder) ) ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_UNKNOWN ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_VERTEX ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_PIXEL ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_GEOMETRY ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_HULL ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_DOMAIN ); - DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderTypeEnumMapping, SHADER_TYPE_COMPUTE ); DEFINE_ENUM_BINDER( m_Bindings, ShaderDesc, ShaderType, SHADER_TYPE, m_ShaderTypeEnumMapping ) + + DEFINE_ENUM_BINDER( m_Bindings, ShaderDesc, DefaultVariableType, SHADER_VARIABLE_TYPE, m_ShaderVarTypeEnumMapping ) + + auto *pShaderDescBinder = + new MemberBinder( + offsetof(ShaderDesc, VariableDesc), + offsetof(ShaderDesc, NumVariables), + VarDescBufferOffset, + VarNamesBufferOffset + ); + m_Bindings.insert( std::make_pair( "VariableDesc", std::unique_ptr(pShaderDescBinder) ) ); + + auto *pStaticSamplerDescBinder = + new MemberBinder( + offsetof(ShaderDesc, StaticSamplers), + offsetof(ShaderDesc, NumStaticSamplers), + StaticSamplersBufferOffset, + StaticSamplerTexNamesBufferOffset + ); + m_Bindings.insert( std::make_pair( "StaticSamplers", std::unique_ptr(pStaticSamplerDescBinder) ) ); } virtual void GetValue( lua_State *L, const void* pBasePointer ) @@ -75,16 +326,17 @@ namespace Diligent private: BindingsMapType m_Bindings; - EnumMapping m_ShaderTypeEnumMapping; + ShaderTypeEnumMapping m_ShaderTypeEnumMapping; + ShaderVariableTypeEnumMapping m_ShaderVarTypeEnumMapping; }; ShaderParser::ShaderParser( IRenderDevice *pRenderDevice, lua_State *L, const String& ResMappingMetatableName ) : EngineObjectParserCommon( pRenderDevice, L, ShaderLibName ), - m_SetShadersBinding( this, L, "Context", "SetShaders", &ShaderParser::SetShaders ), m_BindResourcesBinding( this, L, m_MetatableRegistryName.c_str(), "BindResources", &ShaderParser::BindResources ), m_ResMappingMetatableName(ResMappingMetatableName) { DEFINE_BUFFERED_STRING_BINDER( m_Bindings, ShaderCreationAttribsWrapper, FilePath, FilePathBuffer ) + DEFINE_BUFFERED_STRING_BINDER( m_Bindings, ShaderCreationAttribsWrapper, Source, SourceBuffer ) DEFINE_BUFFERED_STRING_BINDER( m_Bindings, ShaderCreationAttribsWrapper, EntryPoint, EntryPointBuffer ) DEFINE_BUFFERED_STRING_BINDER( m_Bindings, ShaderCreationAttribsWrapper, SearchDirectories, SearchDirectoriesBuffer ) @@ -93,7 +345,15 @@ namespace Diligent DEFINE_ENUM_ELEMENT_MAPPING( m_ShaderSourceLangEnumMapping, SHADER_SOURCE_LANGUAGE_GLSL ); DEFINE_ENUM_BINDER( m_Bindings, ShaderCreationAttribsWrapper, SourceLanguage, SHADER_SOURCE_LANGUAGE, m_ShaderSourceLangEnumMapping ); - DEFINE_BINDER( m_Bindings, ShaderCreationAttribsWrapper, Desc, ShaderDescLoader, 0 ) + auto *pShaderDescBinder = + new MemberBinder( + offsetof(ShaderCreationAttribsWrapper, Desc), + offsetof(ShaderCreationAttribsWrapper, m_VarDescBuffer) - offsetof(ShaderCreationAttribsWrapper, Desc), + offsetof(ShaderCreationAttribsWrapper, m_VarNamesBuffer) - offsetof(ShaderCreationAttribsWrapper, Desc), + offsetof(ShaderCreationAttribsWrapper, m_StaticSamplersBuffer) - offsetof(ShaderCreationAttribsWrapper, Desc), + offsetof(ShaderCreationAttribsWrapper, m_StaticSamplerTexNamesBuffer) - offsetof(ShaderCreationAttribsWrapper, Desc) + ); + m_Bindings.insert( std::make_pair( "Desc", std::unique_ptr(pShaderDescBinder) ) ); }; void ShaderParser::CreateObj( lua_State *L ) @@ -124,8 +384,8 @@ namespace Diligent ShaderCreationAttrs.Desc = (*ppShader)->GetDesc(); PushField( L, &ShaderCreationAttrs, Field, m_Bindings ); } - - int ShaderParser::SetShaders( lua_State *L ) + + int ShaderParser::BindResources( lua_State *L ) { // In order to communicate properly with Lua, a C function must use the following protocol, // which defines the way parameters and results are passed : a C function receives its arguments @@ -137,24 +397,6 @@ namespace Diligent // Any other value in the stack below the results will be properly discarded by Lua. // Like a Lua function, a C function called by Lua can also return many results. - auto NumArgs = lua_gettop( L ); - const int MaxShaders = 6; - IShader* pShaders[MaxShaders] = {}; - VERIFY( NumArgs <= MaxShaders, "Too many shaders are being set" ); - NumArgs = std::min( NumArgs, MaxShaders ); - for( int i = 0; i < NumArgs; ++i ) - { - pShaders[i] = *GetUserData(L, i+1, m_MetatableRegistryName.c_str() ); - } - auto *pContext = LoadDeviceContextFromRegistry( L ); - pContext->SetShaders( pShaders, NumArgs ); - - // Returning no arguments - return 0; - } - - int ShaderParser::BindResources( lua_State *L ) - { try { auto NumArgs = lua_gettop( L ); diff --git a/RenderScript/src/ShaderResourceBindingParser.cpp b/RenderScript/src/ShaderResourceBindingParser.cpp new file mode 100644 index 0000000..4daf2aa --- /dev/null +++ b/RenderScript/src/ShaderResourceBindingParser.cpp @@ -0,0 +1,192 @@ +/* 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS. + * + * In no event and under no legal theory, whether in tort (including negligence), + * contract, or otherwise, unless required by applicable law (such as deliberate + * and grossly negligent acts) or agreed to in writing, shall any Contributor be + * liable for any damages, including any direct, indirect, special, incidental, + * or consequential damages of any character arising as a result of this License or + * out of the use or inability to use the software (including but not limited to damages + * for loss of goodwill, work stoppage, computer failure or malfunction, or any and + * all other commercial damages or losses), even if such Contributor has been advised + * of the possibility of such damages. + */ + +#include "pch.h" +#include "ShaderResourceBindingParser.h" + +namespace Diligent +{ + const Char* ShaderResourceBindingParser::ShaderResourceBindingLibName = "ShaderResourceBinding"; + + ShaderResourceBindingParser::ShaderResourceBindingParser( IRenderDevice *pRenderDevice, lua_State *L, + const String &PSOLibMetatableName, + const String &ResMappingMetatableName, + const String &ShaderVarMetatableRegistryName ) : + m_PSOLibMetatableName(PSOLibMetatableName), + m_ResMappingMetatableName(ResMappingMetatableName), + m_ShaderVarMetatableRegistryName(ShaderVarMetatableRegistryName), + EngineObjectParserBase( pRenderDevice, L, ShaderResourceBindingLibName ), + m_BindResourcesBinding( this, L, m_MetatableRegistryName.c_str(), "BindResources", &ShaderResourceBindingParser::BindResources ), + m_GetVariableBinding( this, L, m_MetatableRegistryName.c_str(), "GetVariable", &ShaderResourceBindingParser::GetVariable ), + m_CreateShaderResourceBinding( this, L, PSOLibMetatableName.c_str(), "CreateShaderResourceBinding", &ShaderResourceBindingParser::CreateShaderResourceBinding ) + { + + } + + + void ShaderResourceBindingParser::CreateObj( lua_State *L ) + { + INIT_LUA_STACK_TRACKING(L); + + // Shader should be the first argument + auto *pPSO = *GetUserData( L, 1, m_PSOLibMetatableName.c_str() ); + + auto pNewShaderResBndngLuaObj = reinterpret_cast(lua_newuserdata( L, sizeof( IShaderResourceBinding* ) )); + pPSO->CreateShaderResourceBinding(pNewShaderResBndngLuaObj); + + CHECK_LUA_STACK_HEIGHT( +1 ); + } + + void ShaderResourceBindingParser::DestroyObj( void *pData ) + { + if( pData != nullptr ) + { + auto ppShaderResBinding = reinterpret_cast(pData); + if( *ppShaderResBinding != nullptr ) + (*ppShaderResBinding)->Release(); + } + } + + void ShaderResourceBindingParser::ReadField( lua_State *L, void *pData, const Char *Field ) + { + SCRIPT_PARSING_ERROR(L, "Shader resource binding have no fields that can be read") + } + + void ShaderResourceBindingParser::UpdateField( lua_State *L, void *pData, const Char *Field ) + { + SCRIPT_PARSING_ERROR(L, "Shader resource binding have no fields that can be updated") + } + + + void ShaderResourceBindingParser::PushExistingObject( lua_State *L, const void *pObject ) + { + auto pShaderResourceBinding = reinterpret_cast(lua_newuserdata( L, sizeof( IShaderResourceBinding* ) )); + *pShaderResourceBinding = reinterpret_cast( const_cast(pObject) ); + (*pShaderResourceBinding)->AddRef(); + } + + + int ShaderResourceBindingParser::CreateShaderResourceBinding( lua_State *L ) + { + return LuaCreate(L); + } + + int ShaderResourceBindingParser::BindResources( lua_State *L ) + { + try + { + auto NumArgs = lua_gettop( L ); + if( NumArgs < 3 ) + { + SCRIPT_PARSING_ERROR( L, "At least 2 arguments (shader flags and resource mapping) are expected" ); + } + + + int ArgStackInd = 1; + + auto *pResBinding = *GetUserData( L, ArgStackInd, m_MetatableRegistryName.c_str() ); + VERIFY( pResBinding, "Resource mapping pointer is null" ); + if( !pResBinding )return 0; + + ++ArgStackInd; + Uint32 ShaderFlags = 0; + { + FlagsLoader FlagsLoader(0, "BindShaderResourceFlags", m_ShaderTypeEnumMapping); + FlagsLoader.SetValue( L, ArgStackInd, &ShaderFlags ); + } + + ++ArgStackInd; + auto *pResourceMapping = *GetUserData( L, ArgStackInd, m_ResMappingMetatableName.c_str() ); + if( !pResourceMapping ) + { + SCRIPT_PARSING_ERROR( L, "Incorrect 2nd argument type: resource mapping is expected" ); + } + + ++ArgStackInd; + Uint32 Flags = 0; + // The last argument may be flags + if( NumArgs >= ArgStackInd && + (lua_type( L, ArgStackInd ) == LUA_TSTRING || lua_type( L, ArgStackInd ) == LUA_TTABLE ) ) + { + FlagsLoader FlagsLoader(0, "BindShaderResourceFlags", m_BindShaderResFlagEnumMapping); + FlagsLoader.SetValue( L, ArgStackInd, &Flags ); + } + + pResBinding->BindResources( ShaderFlags, pResourceMapping, Flags ); + } + catch( const std::runtime_error& ) + { + + } + return 0; + } + + int ShaderResourceBindingParser::GetVariable( lua_State *L ) + { + auto NumArgs = lua_gettop( L ); + if( NumArgs < 3 ) + { + SCRIPT_PARSING_ERROR( L, "2 arguments (shader type and variable name) are expected" ); + } + + INIT_LUA_STACK_TRACKING(L); + + int ArgStackInd = 1; + + // The object itself goes first + auto *pShaderResBinding = *GetUserData( L, ArgStackInd, m_MetatableRegistryName.c_str() ); + + // Shader type should be the first argument + ++ArgStackInd; + SHADER_TYPE ShaderType = SHADER_TYPE_UNKNOWN; + EnumMemberBinder ShaderTypeParser(0, "ShaderType", m_ShaderTypeEnumMapping); + ShaderTypeParser.SetValue(L, ArgStackInd, &ShaderType); + + ++ArgStackInd; + // Variable name should be the second argument + auto VarName = ReadValueFromLua( L, ArgStackInd ); + + auto pVar = pShaderResBinding->GetVariable(ShaderType, VarName.c_str()); + + auto pNewShaderVarLuaObj = reinterpret_cast(lua_newuserdata( L, sizeof( IShaderVariable* ) )); + *pNewShaderVarLuaObj = pVar; + pVar->AddRef(); + + // Push onto the stack the metatable associated with name given in the registry + luaL_getmetatable( L, m_ShaderVarMetatableRegistryName.c_str() ); // -0 | +1 -> +1 + // Pop a table from the top of the stack and set it as the new metatable + // for the value at the given index (which is where the new user datum is) + lua_setmetatable( L, -2 ); // -1 | +0 -> -1 + + CHECK_LUA_STACK_HEIGHT( +1 ); + + return 1; + } + + void ShaderResourceBindingParser::GetObjectByName( lua_State *L, const Char *ShaderName, IShaderResourceBinding** ppObject ) + { + auto pObject = *GetGlobalObject( L, ShaderName, m_MetatableRegistryName.c_str() ); + *ppObject = pObject; + pObject->AddRef(); + } +} diff --git a/RenderScript/src/ShaderVariableParser.cpp b/RenderScript/src/ShaderVariableParser.cpp index 35b5361..62dc8ba 100644 --- a/RenderScript/src/ShaderVariableParser.cpp +++ b/RenderScript/src/ShaderVariableParser.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/RenderScript/src/TextureParser.cpp b/RenderScript/src/TextureParser.cpp index 628c9a1..a7ac219 100644 --- a/RenderScript/src/TextureParser.cpp +++ b/RenderScript/src/TextureParser.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. @@ -29,12 +29,69 @@ namespace Diligent { const Char* TextureParser::TextureLibName = "Texture"; + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder(size_t MemberOffset, int /*Dummy*/) : + MemberBinderBase(MemberOffset) + { + DEFINE_BINDER( m_Bindings, DepthStencilClearValue, Depth, Float32, Validator("Depth clear value", 0.f, 1.f) ) + DEFINE_BINDER( m_Bindings, DepthStencilClearValue, Stencil, Uint8, Validator() ) + } + + virtual void GetValue(lua_State *L, const void* pBasePointer)override + { + const auto *pDSClearValue = &GetMemberByOffest( pBasePointer, m_MemberOffset ); + PushLuaTable( L, pDSClearValue, m_Bindings ); + } + + virtual void SetValue(lua_State *L, int Index, void* pBasePointer)override + { + auto *pDSClearValue = &GetMemberByOffest(pBasePointer, m_MemberOffset); + ParseLuaTable( L, Index, pDSClearValue, m_Bindings ); + } + + private: + BindingsMapType m_Bindings; + }; + + template<> + class MemberBinder : public MemberBinderBase + { + public: + MemberBinder(size_t MemberOffset, int /*Dummy*/) : + MemberBinderBase(MemberOffset) + { + DEFINE_ENUM_BINDER( m_Bindings, OptimizedClearValue, Format, TEXTURE_FORMAT, m_TexFmtEnumMapping ); + DEFINE_BINDER( m_Bindings, OptimizedClearValue, Color, RGBALoader, 0 ) + DEFINE_BINDER( m_Bindings, OptimizedClearValue, DepthStencil, DepthStencilClearValue, 0 ) + } + + virtual void GetValue(lua_State *L, const void* pBasePointer)override + { + const auto *pClearValue = &GetMemberByOffest( pBasePointer, m_MemberOffset ); + PushLuaTable( L, pClearValue, m_Bindings ); + } + + virtual void SetValue(lua_State *L, int Index, void* pBasePointer)override + { + auto *pClearValue = &GetMemberByOffest(pBasePointer, m_MemberOffset); + ParseLuaTable( L, Index, pClearValue, m_Bindings ); + } + + private: + BindingsMapType m_Bindings; + TextureFormatEnumMapping m_TexFmtEnumMapping; + }; + + TextureParser::TextureParser( IRenderDevice *pRenderDevice, lua_State *L ) : EngineObjectParserCommon( pRenderDevice, L, TextureLibName ) { DEFINE_BUFFERED_STRING_BINDER( m_Bindings, STexDescWrapper, Name, NameBuffer ) - DEFINE_ENUM_BINDER( m_Bindings, STexDescWrapper, Type, TEXTURE_TYPE, m_TexTypeEnumMapping ); + DEFINE_ENUM_BINDER( m_Bindings, STexDescWrapper, Type, RESOURCE_DIMENSION, m_TexTypeEnumMapping ); DEFINE_BINDER( m_Bindings, STexDescWrapper, Width, Uint32, Validator( "Width", 1, 16384 ) ); DEFINE_BINDER( m_Bindings, STexDescWrapper, Height, Uint32, Validator( "Heihght", 1, 16384 ) ); @@ -64,6 +121,8 @@ namespace Diligent DEFINE_ENUM_ELEMENT_MAPPING( m_MiscFlagEnumMapping, MISC_TEXTURE_FLAG_GENERATE_MIPS ); DEFINE_FLAGS_BINDER( m_Bindings, STexDescWrapper, MiscFlags, Diligent::MISC_TEXTURE_FLAG, m_MiscFlagEnumMapping ); + + DEFINE_BINDER( m_Bindings, STexDescWrapper, ClearValue, OptimizedClearValue, 0 ); }; void TextureParser::CreateObj( lua_State *L ) diff --git a/RenderScript/src/TextureViewParser.cpp b/RenderScript/src/TextureViewParser.cpp index 20ddabb..c4b82d5 100644 --- a/RenderScript/src/TextureViewParser.cpp +++ b/RenderScript/src/TextureViewParser.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. @@ -54,7 +54,7 @@ namespace Diligent "Unexpected map size. Did you update TEXTURE_VIEW_TYPE enum?" ); DEFINE_ENUM_BINDER( m_Bindings, STexViewDescWrapper, ViewType, TEXTURE_VIEW_TYPE, m_ViewTypeEnumMapping ); - DEFINE_ENUM_BINDER( m_Bindings, STexViewDescWrapper, TextureType, TEXTURE_TYPE, m_TexTypeEnumMapping ); + DEFINE_ENUM_BINDER( m_Bindings, STexViewDescWrapper, TextureDim, RESOURCE_DIMENSION, m_TexTypeEnumMapping ); DEFINE_ENUM_BINDER( m_Bindings, STexViewDescWrapper, Format, TEXTURE_FORMAT, m_TexFormatEnumMapping ); DEFINE_BINDER( m_Bindings, STexViewDescWrapper, MostDetailedMip, Uint32, Validator( "MostDetailedMip", 0, 16384 ) ); diff --git a/RenderScript/src/ViewportParser.cpp b/RenderScript/src/ViewportParser.cpp index 7afbfe6..91e4c31 100644 --- a/RenderScript/src/ViewportParser.cpp +++ b/RenderScript/src/ViewportParser.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/RenderScript/src/pch.cpp b/RenderScript/src/pch.cpp index 4a893f2..964b3f1 100644 --- a/RenderScript/src/pch.cpp +++ b/RenderScript/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. 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. diff --git a/build/Windows/Tools.sln b/build/Windows/Tools.sln deleted file mode 100644 index 1a088f9..0000000 --- a/build/Windows/Tools.sln +++ /dev/null @@ -1,515 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{FE04C232-8768-46C8-827A-849EBCB59093}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphics", "Graphics", "{87E3C971-12B7-46A3-9778-51AF0BC44B19}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "core", "{C4A0C5BD-E1F5-47B0-A023-BC760BC893FC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{48B8359B-0AAF-4799-A678-247B938D4145}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "..\..\..\diligentcore\External\glew-1.10.0\build\Windows\glew_static.vcxproj", "{664E6F0D-6784-4760-9565-D54F8EB1EDF4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngine.Shared", "..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems", "{0CDD843C-089D-4FEE-BE9F-C08FA2B51ACB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngine", "..\..\..\diligentcore\Graphics\GraphicsEngine\build\Windows\GraphicsEngine.vcxproj", "{052DD700-477C-4512-A7F4-B05EBEF5C80E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngineD3D11.Shared", "..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems", "{3C22010C-99F3-4321-8F55-36DA8F97A980}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngineD3D11", "..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\Windows\GraphicsEngineD3D11.vcxproj", "{FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngineOpenGL", "..\..\..\diligentcore\Graphics\GraphicsEngineOpenGL\build\Windows\GraphicsEngineOpenGL.vcxproj", "{15E346D3-FDE6-4B29-88B7-FCA14DADA501}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsTools.Shared", "..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems", "{3BB4F2AC-1D2F-4AF6-B9CC-BDC17BB8BC39}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsTools", "..\..\..\diligentcore\Graphics\GraphicsTools\build\Windows\GraphicsTools.vcxproj", "{C6014499-0CF2-43EC-A773-A4E354FB2D74}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AndroidPlatform", "..\..\..\diligentcore\Platforms\Android\build\Windows\AndroidPlatform.vcxproj", "{E333476E-15E3-4D43-A4CF-8748058B3BE9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsPlatform", "..\..\..\diligentcore\Platforms\Windows\build\Windows\WindowsPlatform.vcxproj", "{58F32677-436B-412A-BBF8-2B1310D82CD8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicPlatform.Shared", "..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems", "{C50F6528-6A12-49A9-BEC0-E07CF153FCA8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicPlatform", "..\..\..\diligentcore\Platforms\Basic\build\Windows\BasicPlatform.vcxproj", "{8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Shared", "..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems", "{D716BF4D-094B-47D7-9137-A01C690C3616}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\..\..\diligentcore\Common\build\Windows\Common.vcxproj", "{7380F7E6-315F-4B4E-92EB-E6AEEE865298}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg.Shared", "..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems", "{E0CA2A6C-095A-454E-B566-31E81D91615D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibTiff.Shared", "..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems", "{0E12BAA7-7B7D-406F-8374-075598833B2A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng.Shared", "..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems", "{8C6B12D1-7972-451F-A612-E7AC3443CB72}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib.Shared", "..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems", "{40CCCED6-03E5-4CA9-A235-990C055DFE70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua.Shared", "..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems", "{4703C34C-1A7F-4BB2-8FF8-007C55C015D5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderScript.Shared", "..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems", "{AC843CD8-70C4-4BF9-BBFB-BB8E5979F81E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureLoader.Shared", "..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems", "{149D2147-99EC-471E-A8CF-D894E0D11EDA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\..\External\libjpeg-9a\build\Windows\libjpeg.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibTiff", "..\..\External\libtiff-4.0.3\build\Windows\LibTiff.vcxproj", "{97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng", "..\..\External\lpng-1.6.17\build\Windows\LibPng.vcxproj", "{822F4B60-069A-4F54-A219-DD4562A254A1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua", "..\..\External\lua-5.2.3\build\Windows\Lua.vcxproj", "{3F7FED43-207A-4C2C-80C4-5965448D0706}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\External\zlib-1.2.8\build\Windows\zlib.vcxproj", "{695C52B1-0267-4DED-BDF3-E7113756FF3F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderScript", "..\..\RenderScript\build\Windows\RenderScript.vcxproj", "{C8ADD3B4-E83B-458E-96C8-B278F22C2F04}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureLoader", "..\..\TextureLoader\build\Windows\TextureLoader.vcxproj", "{3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformInterface.Shared", "..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems", "{C8F281ED-F3B9-4C24-A2D3-40A922363466}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems*{3de4fdb9-df4d-4b57-9ffe-616704d4fe2f}*SharedItemsImports = 4 - ..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems*{695c52b1-0267-4ded-bdf3-e7113756ff3f}*SharedItemsImports = 4 - ..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems*{c8add3b4-e83b-458e-96c8-b278f22c2f04}*SharedItemsImports = 4 - ..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems*{019dbd2a-273d-4ba4-bf86-b5efe2ed76b1}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems*{3c22010c-99f3-4321-8f55-36da8f97a980}*SharedItemsImports = 9 - ..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems*{3bb4f2ac-1d2f-4af6-b9cc-bdc17bb8bc39}*SharedItemsImports = 9 - ..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems*{7380f7e6-315f-4b4e-92eb-e6aeee865298}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems*{0cdd843c-089d-4fee-be9f-c08fa2b51acb}*SharedItemsImports = 9 - ..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems*{e0ca2a6c-095a-454e-b566-31e81d91615d}*SharedItemsImports = 9 - ..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems*{40ccced6-03e5-4ca9-a235-990c055dfe70}*SharedItemsImports = 9 - ..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems*{8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems*{8ada5f93-7a38-4ad8-b8f5-1ffd4d4f630c}*SharedItemsImports = 4 - ..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems*{97d592a8-5afe-4e72-8da9-3c3ef98948b1}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems*{052dd700-477c-4512-a7f4-b05ebef5c80e}*SharedItemsImports = 4 - ..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems*{8c6b12d1-7972-451f-a612-e7ac3443cb72}*SharedItemsImports = 9 - ..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems*{fe289cc7-15d6-4a76-b9cb-f61cab3192c9}*SharedItemsImports = 4 - ..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems*{3f7fed43-207a-4c2c-80c4-5965448d0706}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems*{c50f6528-6a12-49a9-bec0-e07cf153fca8}*SharedItemsImports = 9 - ..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems*{149d2147-99ec-471e-a8cf-d894e0d11eda}*SharedItemsImports = 9 - ..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems*{822f4b60-069a-4f54-a219-dd4562a254a1}*SharedItemsImports = 4 - ..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems*{4703c34c-1a7f-4bb2-8ff8-007c55c015d5}*SharedItemsImports = 9 - ..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems*{ac843cd8-70c4-4bf9-bbfb-bb8e5979f81e}*SharedItemsImports = 9 - ..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems*{c6014499-0cf2-43ec-a773-a4e354fb2d74}*SharedItemsImports = 4 - ..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems*{0e12baa7-7b7d-406f-8374-075598833b2a}*SharedItemsImports = 9 - ..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems*{c8f281ed-f3b9-4c24-a2d3-40a922363466}*SharedItemsImports = 9 - ..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems*{d716bf4d-094b-47d7-9137-a01c690c3616}*SharedItemsImports = 9 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - DbgDLL|ARM = DbgDLL|ARM - DbgDLL|Win32 = DbgDLL|Win32 - DbgDLL|x64 = DbgDLL|x64 - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - RelDLL|ARM = RelDLL|ARM - RelDLL|Win32 = RelDLL|Win32 - RelDLL|x64 = RelDLL|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.DbgDLL|ARM.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.DbgDLL|Win32.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.DbgDLL|x64.ActiveCfg = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.DbgDLL|x64.Build.0 = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|ARM.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.ActiveCfg = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|x64.Build.0 = Debug|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.RelDLL|ARM.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.RelDLL|Win32.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.RelDLL|Win32.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.RelDLL|x64.ActiveCfg = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.RelDLL|x64.Build.0 = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|ARM.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.ActiveCfg = Release|x64 - {664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|x64.Build.0 = Release|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.DbgDLL|ARM.Build.0 = Debug|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.DbgDLL|Win32.Build.0 = Debug|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.DbgDLL|x64.ActiveCfg = Debug|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.DbgDLL|x64.Build.0 = Debug|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|ARM.ActiveCfg = Debug|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|ARM.Build.0 = Debug|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|Win32.ActiveCfg = Debug|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|Win32.Build.0 = Debug|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|x64.ActiveCfg = Debug|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Debug|x64.Build.0 = Debug|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.RelDLL|ARM.ActiveCfg = Release|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.RelDLL|ARM.Build.0 = Release|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.RelDLL|Win32.ActiveCfg = Release|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.RelDLL|Win32.Build.0 = Release|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.RelDLL|x64.ActiveCfg = Release|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.RelDLL|x64.Build.0 = Release|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|ARM.ActiveCfg = Release|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|ARM.Build.0 = Release|ARM - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|Win32.ActiveCfg = Release|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|Win32.Build.0 = Release|Win32 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|x64.ActiveCfg = Release|x64 - {052DD700-477C-4512-A7F4-B05EBEF5C80E}.Release|x64.Build.0 = Release|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.DbgDLL|ARM.ActiveCfg = Debug|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.DbgDLL|Win32.ActiveCfg = DbgDLL|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.DbgDLL|Win32.Build.0 = DbgDLL|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.DbgDLL|x64.ActiveCfg = DbgDLL|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.DbgDLL|x64.Build.0 = DbgDLL|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|ARM.ActiveCfg = Debug|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|Win32.Build.0 = Debug|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|x64.ActiveCfg = Debug|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Debug|x64.Build.0 = Debug|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.RelDLL|ARM.ActiveCfg = Release|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.RelDLL|Win32.ActiveCfg = RelDLL|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.RelDLL|Win32.Build.0 = RelDLL|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.RelDLL|x64.ActiveCfg = RelDLL|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.RelDLL|x64.Build.0 = RelDLL|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|ARM.ActiveCfg = Release|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|Win32.ActiveCfg = Release|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|Win32.Build.0 = Release|Win32 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|x64.ActiveCfg = Release|x64 - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9}.Release|x64.Build.0 = Release|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.DbgDLL|ARM.Build.0 = Debug|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.DbgDLL|Win32.ActiveCfg = DbgDLL|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.DbgDLL|Win32.Build.0 = DbgDLL|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.DbgDLL|x64.ActiveCfg = DbgDLL|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.DbgDLL|x64.Build.0 = DbgDLL|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|ARM.ActiveCfg = Debug|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|ARM.Build.0 = Debug|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|Win32.ActiveCfg = Debug|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|Win32.Build.0 = Debug|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|x64.ActiveCfg = Debug|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Debug|x64.Build.0 = Debug|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.RelDLL|ARM.ActiveCfg = Release|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.RelDLL|ARM.Build.0 = Release|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.RelDLL|Win32.ActiveCfg = RelDLL|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.RelDLL|Win32.Build.0 = RelDLL|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.RelDLL|x64.ActiveCfg = RelDLL|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.RelDLL|x64.Build.0 = RelDLL|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|ARM.ActiveCfg = Release|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|ARM.Build.0 = Release|ARM - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|Win32.ActiveCfg = Release|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|Win32.Build.0 = Release|Win32 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|x64.ActiveCfg = Release|x64 - {15E346D3-FDE6-4B29-88B7-FCA14DADA501}.Release|x64.Build.0 = Release|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.DbgDLL|ARM.Build.0 = Debug|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.DbgDLL|Win32.Build.0 = Debug|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.DbgDLL|x64.ActiveCfg = Debug|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.DbgDLL|x64.Build.0 = Debug|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|ARM.ActiveCfg = Debug|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|ARM.Build.0 = Debug|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|Win32.ActiveCfg = Debug|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|Win32.Build.0 = Debug|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|x64.ActiveCfg = Debug|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Debug|x64.Build.0 = Debug|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.RelDLL|ARM.ActiveCfg = Release|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.RelDLL|ARM.Build.0 = Release|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.RelDLL|Win32.ActiveCfg = Release|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.RelDLL|Win32.Build.0 = Release|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.RelDLL|x64.ActiveCfg = Release|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.RelDLL|x64.Build.0 = Release|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|ARM.ActiveCfg = Release|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|ARM.Build.0 = Release|ARM - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|Win32.ActiveCfg = Release|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|Win32.Build.0 = Release|Win32 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|x64.ActiveCfg = Release|x64 - {C6014499-0CF2-43EC-A773-A4E354FB2D74}.Release|x64.Build.0 = Release|x64 - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.DbgDLL|ARM.Build.0 = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.DbgDLL|Win32.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.DbgDLL|x64.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|ARM.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|ARM.Build.0 = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|Win32.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Debug|x64.ActiveCfg = Debug|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.RelDLL|ARM.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.RelDLL|ARM.Build.0 = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.RelDLL|Win32.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.RelDLL|x64.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|ARM.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|ARM.Build.0 = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|Win32.ActiveCfg = Release|ARM - {E333476E-15E3-4D43-A4CF-8748058B3BE9}.Release|x64.ActiveCfg = Release|ARM - {58F32677-436B-412A-BBF8-2B1310D82CD8}.DbgDLL|ARM.ActiveCfg = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.DbgDLL|Win32.Build.0 = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.DbgDLL|x64.ActiveCfg = Debug|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.DbgDLL|x64.Build.0 = Debug|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|ARM.ActiveCfg = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|Win32.ActiveCfg = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|Win32.Build.0 = Debug|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|x64.ActiveCfg = Debug|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Debug|x64.Build.0 = Debug|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.RelDLL|ARM.ActiveCfg = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.RelDLL|Win32.ActiveCfg = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.RelDLL|Win32.Build.0 = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.RelDLL|x64.ActiveCfg = Release|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.RelDLL|x64.Build.0 = Release|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|ARM.ActiveCfg = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|Win32.ActiveCfg = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|Win32.Build.0 = Release|Win32 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|x64.ActiveCfg = Release|x64 - {58F32677-436B-412A-BBF8-2B1310D82CD8}.Release|x64.Build.0 = Release|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.DbgDLL|ARM.Build.0 = Debug|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.DbgDLL|Win32.Build.0 = Debug|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.DbgDLL|x64.ActiveCfg = Debug|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.DbgDLL|x64.Build.0 = Debug|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|ARM.ActiveCfg = Debug|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|ARM.Build.0 = Debug|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|Win32.ActiveCfg = Debug|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|Win32.Build.0 = Debug|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|x64.ActiveCfg = Debug|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Debug|x64.Build.0 = Debug|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.RelDLL|ARM.ActiveCfg = Release|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.RelDLL|ARM.Build.0 = Release|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.RelDLL|Win32.ActiveCfg = Release|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.RelDLL|Win32.Build.0 = Release|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.RelDLL|x64.ActiveCfg = Release|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.RelDLL|x64.Build.0 = Release|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|ARM.ActiveCfg = Release|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|ARM.Build.0 = Release|ARM - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|Win32.ActiveCfg = Release|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|Win32.Build.0 = Release|Win32 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|x64.ActiveCfg = Release|x64 - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C}.Release|x64.Build.0 = Release|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.DbgDLL|ARM.Build.0 = Debug|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.DbgDLL|Win32.Build.0 = Debug|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.DbgDLL|x64.ActiveCfg = Debug|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.DbgDLL|x64.Build.0 = Debug|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|ARM.ActiveCfg = Debug|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|ARM.Build.0 = Debug|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|Win32.ActiveCfg = Debug|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|Win32.Build.0 = Debug|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|x64.ActiveCfg = Debug|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Debug|x64.Build.0 = Debug|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.RelDLL|ARM.ActiveCfg = Release|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.RelDLL|ARM.Build.0 = Release|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.RelDLL|Win32.ActiveCfg = Release|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.RelDLL|Win32.Build.0 = Release|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.RelDLL|x64.ActiveCfg = Release|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.RelDLL|x64.Build.0 = Release|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|ARM.ActiveCfg = Release|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|ARM.Build.0 = Release|ARM - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|Win32.ActiveCfg = Release|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|Win32.Build.0 = Release|Win32 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|x64.ActiveCfg = Release|x64 - {7380F7E6-315F-4B4E-92EB-E6AEEE865298}.Release|x64.Build.0 = Release|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.DbgDLL|ARM.Build.0 = Debug|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.DbgDLL|Win32.Build.0 = Debug|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.DbgDLL|x64.ActiveCfg = Debug|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.DbgDLL|x64.Build.0 = Debug|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|ARM.ActiveCfg = Debug|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|ARM.Build.0 = Debug|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|Win32.Build.0 = Debug|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|x64.ActiveCfg = Debug|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Debug|x64.Build.0 = Debug|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.RelDLL|ARM.ActiveCfg = Release|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.RelDLL|ARM.Build.0 = Release|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.RelDLL|Win32.ActiveCfg = Release|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.RelDLL|Win32.Build.0 = Release|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.RelDLL|x64.ActiveCfg = Release|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.RelDLL|x64.Build.0 = Release|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|ARM.ActiveCfg = Release|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|ARM.Build.0 = Release|ARM - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|Win32.ActiveCfg = Release|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|Win32.Build.0 = Release|Win32 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|x64.ActiveCfg = Release|x64 - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}.Release|x64.Build.0 = Release|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.DbgDLL|ARM.Build.0 = Debug|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.DbgDLL|Win32.Build.0 = Debug|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.DbgDLL|x64.ActiveCfg = Debug|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.DbgDLL|x64.Build.0 = Debug|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Debug|ARM.ActiveCfg = Debug|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Debug|ARM.Build.0 = Debug|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Debug|Win32.Build.0 = Debug|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Debug|x64.ActiveCfg = Debug|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Debug|x64.Build.0 = Debug|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.RelDLL|ARM.ActiveCfg = Release|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.RelDLL|ARM.Build.0 = Release|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.RelDLL|Win32.ActiveCfg = Release|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.RelDLL|Win32.Build.0 = Release|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.RelDLL|x64.ActiveCfg = Release|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.RelDLL|x64.Build.0 = Release|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Release|ARM.ActiveCfg = Release|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Release|ARM.Build.0 = Release|ARM - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Release|Win32.ActiveCfg = Release|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Release|Win32.Build.0 = Release|Win32 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Release|x64.ActiveCfg = Release|x64 - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1}.Release|x64.Build.0 = Release|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.DbgDLL|ARM.Build.0 = Debug|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.DbgDLL|Win32.Build.0 = Debug|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.DbgDLL|x64.ActiveCfg = Debug|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.DbgDLL|x64.Build.0 = Debug|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Debug|ARM.ActiveCfg = Debug|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.Debug|ARM.Build.0 = Debug|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.Debug|Win32.ActiveCfg = Debug|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Debug|Win32.Build.0 = Debug|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Debug|x64.ActiveCfg = Debug|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Debug|x64.Build.0 = Debug|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.RelDLL|ARM.ActiveCfg = Release|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.RelDLL|ARM.Build.0 = Release|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.RelDLL|Win32.ActiveCfg = Release|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.RelDLL|Win32.Build.0 = Release|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.RelDLL|x64.ActiveCfg = Release|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.RelDLL|x64.Build.0 = Release|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Release|ARM.ActiveCfg = Release|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.Release|ARM.Build.0 = Release|ARM - {822F4B60-069A-4F54-A219-DD4562A254A1}.Release|Win32.ActiveCfg = Release|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Release|Win32.Build.0 = Release|Win32 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Release|x64.ActiveCfg = Release|x64 - {822F4B60-069A-4F54-A219-DD4562A254A1}.Release|x64.Build.0 = Release|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.DbgDLL|ARM.Build.0 = Debug|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.DbgDLL|Win32.Build.0 = Debug|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.DbgDLL|x64.ActiveCfg = Debug|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.DbgDLL|x64.Build.0 = Debug|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Debug|ARM.ActiveCfg = Debug|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Debug|ARM.Build.0 = Debug|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Debug|Win32.ActiveCfg = Debug|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Debug|Win32.Build.0 = Debug|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Debug|x64.ActiveCfg = Debug|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Debug|x64.Build.0 = Debug|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.RelDLL|ARM.ActiveCfg = Release|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.RelDLL|ARM.Build.0 = Release|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.RelDLL|Win32.ActiveCfg = Release|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.RelDLL|Win32.Build.0 = Release|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.RelDLL|x64.ActiveCfg = Release|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.RelDLL|x64.Build.0 = Release|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Release|ARM.ActiveCfg = Release|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Release|ARM.Build.0 = Release|ARM - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Release|Win32.ActiveCfg = Release|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Release|Win32.Build.0 = Release|Win32 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Release|x64.ActiveCfg = Release|x64 - {3F7FED43-207A-4C2C-80C4-5965448D0706}.Release|x64.Build.0 = Release|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.DbgDLL|ARM.Build.0 = Debug|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.DbgDLL|Win32.Build.0 = Debug|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.DbgDLL|x64.ActiveCfg = Debug|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.DbgDLL|x64.Build.0 = Debug|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Debug|ARM.ActiveCfg = Debug|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Debug|ARM.Build.0 = Debug|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Debug|Win32.ActiveCfg = Debug|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Debug|Win32.Build.0 = Debug|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Debug|x64.ActiveCfg = Debug|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Debug|x64.Build.0 = Debug|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.RelDLL|ARM.ActiveCfg = Release|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.RelDLL|ARM.Build.0 = Release|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.RelDLL|Win32.ActiveCfg = Release|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.RelDLL|Win32.Build.0 = Release|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.RelDLL|x64.ActiveCfg = Release|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.RelDLL|x64.Build.0 = Release|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Release|ARM.ActiveCfg = Release|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Release|ARM.Build.0 = Release|ARM - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Release|Win32.ActiveCfg = Release|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Release|Win32.Build.0 = Release|Win32 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Release|x64.ActiveCfg = Release|x64 - {695C52B1-0267-4DED-BDF3-E7113756FF3F}.Release|x64.Build.0 = Release|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.DbgDLL|ARM.Build.0 = Debug|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.DbgDLL|Win32.Build.0 = Debug|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.DbgDLL|x64.ActiveCfg = Debug|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.DbgDLL|x64.Build.0 = Debug|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Debug|ARM.ActiveCfg = Debug|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Debug|ARM.Build.0 = Debug|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Debug|Win32.ActiveCfg = Debug|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Debug|Win32.Build.0 = Debug|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Debug|x64.ActiveCfg = Debug|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Debug|x64.Build.0 = Debug|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.RelDLL|ARM.ActiveCfg = Release|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.RelDLL|ARM.Build.0 = Release|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.RelDLL|Win32.ActiveCfg = Release|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.RelDLL|Win32.Build.0 = Release|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.RelDLL|x64.ActiveCfg = Release|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.RelDLL|x64.Build.0 = Release|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Release|ARM.ActiveCfg = Release|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Release|ARM.Build.0 = Release|ARM - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Release|Win32.ActiveCfg = Release|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Release|Win32.Build.0 = Release|Win32 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Release|x64.ActiveCfg = Release|x64 - {C8ADD3B4-E83B-458E-96C8-B278F22C2F04}.Release|x64.Build.0 = Release|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.DbgDLL|ARM.ActiveCfg = Debug|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.DbgDLL|ARM.Build.0 = Debug|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.DbgDLL|Win32.ActiveCfg = Debug|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.DbgDLL|Win32.Build.0 = Debug|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.DbgDLL|x64.ActiveCfg = Debug|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.DbgDLL|x64.Build.0 = Debug|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Debug|ARM.ActiveCfg = Debug|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Debug|ARM.Build.0 = Debug|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Debug|Win32.ActiveCfg = Debug|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Debug|Win32.Build.0 = Debug|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Debug|x64.ActiveCfg = Debug|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Debug|x64.Build.0 = Debug|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.RelDLL|ARM.ActiveCfg = Release|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.RelDLL|ARM.Build.0 = Release|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.RelDLL|Win32.ActiveCfg = Release|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.RelDLL|Win32.Build.0 = Release|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.RelDLL|x64.ActiveCfg = Release|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.RelDLL|x64.Build.0 = Release|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Release|ARM.ActiveCfg = Release|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Release|ARM.Build.0 = Release|ARM - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Release|Win32.ActiveCfg = Release|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Release|Win32.Build.0 = Release|Win32 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Release|x64.ActiveCfg = Release|x64 - {3DE4FDB9-DF4D-4B57-9FFE-616704D4FE2F}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {FE04C232-8768-46C8-827A-849EBCB59093} = {C4A0C5BD-E1F5-47B0-A023-BC760BC893FC} - {87E3C971-12B7-46A3-9778-51AF0BC44B19} = {C4A0C5BD-E1F5-47B0-A023-BC760BC893FC} - {48B8359B-0AAF-4799-A678-247B938D4145} = {C4A0C5BD-E1F5-47B0-A023-BC760BC893FC} - {664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {48B8359B-0AAF-4799-A678-247B938D4145} - {0CDD843C-089D-4FEE-BE9F-C08FA2B51ACB} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {052DD700-477C-4512-A7F4-B05EBEF5C80E} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {3C22010C-99F3-4321-8F55-36DA8F97A980} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {FE289CC7-15D6-4A76-B9CB-F61CAB3192C9} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {15E346D3-FDE6-4B29-88B7-FCA14DADA501} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {3BB4F2AC-1D2F-4AF6-B9CC-BDC17BB8BC39} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {C6014499-0CF2-43EC-A773-A4E354FB2D74} = {87E3C971-12B7-46A3-9778-51AF0BC44B19} - {E333476E-15E3-4D43-A4CF-8748058B3BE9} = {FE04C232-8768-46C8-827A-849EBCB59093} - {58F32677-436B-412A-BBF8-2B1310D82CD8} = {FE04C232-8768-46C8-827A-849EBCB59093} - {C50F6528-6A12-49A9-BEC0-E07CF153FCA8} = {FE04C232-8768-46C8-827A-849EBCB59093} - {8ADA5F93-7A38-4AD8-B8F5-1FFD4D4F630C} = {FE04C232-8768-46C8-827A-849EBCB59093} - {D716BF4D-094B-47D7-9137-A01C690C3616} = {C4A0C5BD-E1F5-47B0-A023-BC760BC893FC} - {7380F7E6-315F-4B4E-92EB-E6AEEE865298} = {C4A0C5BD-E1F5-47B0-A023-BC760BC893FC} - {E0CA2A6C-095A-454E-B566-31E81D91615D} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {0E12BAA7-7B7D-406F-8374-075598833B2A} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {8C6B12D1-7972-451F-A612-E7AC3443CB72} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {4703C34C-1A7F-4BB2-8FF8-007C55C015D5} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {97D592A8-5AFE-4E72-8DA9-3C3EF98948B1} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {822F4B60-069A-4F54-A219-DD4562A254A1} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {3F7FED43-207A-4C2C-80C4-5965448D0706} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {695C52B1-0267-4DED-BDF3-E7113756FF3F} = {4E2A7D78-150F-41DB-A6BD-7FC085FA4BAD} - {C8F281ED-F3B9-4C24-A2D3-40A922363466} = {FE04C232-8768-46C8-827A-849EBCB59093} - EndGlobalSection -EndGlobal diff --git a/build/WindowsStore/Tools.sln b/build/WindowsStore/Tools.sln deleted file mode 100644 index 479b702..0000000 --- a/build/WindowsStore/Tools.sln +++ /dev/null @@ -1,516 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{73304178-C768-4EED-B361-2C1979903E78}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GraphicsEngine", "GraphicsEngine", "{6D6ED57C-211D-400C-BB28-44BBFD0981F7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngine.Shared", "..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems", "{0CDD843C-089D-4FEE-BE9F-C08FA2B51ACB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngine.Windows", "..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Windows\GraphicsEngine.Windows.vcxproj", "{9DF5553C-CA9D-4CB6-A06A-CA905119C00B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngine.WindowsPhone", "..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.WindowsPhone\GraphicsEngine.WindowsPhone.vcxproj", "{AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{9411517F-A716-4F79-BEFC-A21E2360C767}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Shared", "..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems", "{D716BF4D-094B-47D7-9137-A01C690C3616}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Windows", "..\..\..\diligentcore\Common\build\WindowsStore\Common.Windows\Common.Windows.vcxproj", "{4F9E9C58-6840-4F2F-A456-DD039FC790A4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.WindowsPhone", "..\..\..\diligentcore\Common\build\WindowsStore\Common.WindowsPhone\Common.WindowsPhone.vcxproj", "{8B4477C9-E00B-48CE-BD60-ED694593CD85}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{78276F35-06BA-412C-AC96-04D2B9FC84F4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BasicPlatform", "BasicPlatform", "{E9BE9596-934C-4336-888C-FDEF9D3FC610}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicPlatform.Shared", "..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems", "{C50F6528-6A12-49A9-BEC0-E07CF153FCA8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicPlatform.Windows", "..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Windows\BasicPlatform.Windows.vcxproj", "{3F28C683-66AD-42CA-A264-B18D0743F518}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicPlatform.WindowsPhone", "..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.WindowsPhone\BasicPlatform.WindowsPhone.vcxproj", "{6B4CF863-1024-45E2-BA7E-263DE516468B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsStore", "WindowsStore", "{EA965843-C00C-4401-9FE2-4E913B54BD9F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsStorePlatform.Shared", "..\..\..\diligentcore\Platforms\WindowsStore\build\WindowsStore\WindowsStorePlatform.Shared\WindowsStorePlatform.Shared.vcxitems", "{65C1955F-C69E-4185-8B89-864725706A36}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsStorePlatform.Windows", "..\..\..\diligentcore\Platforms\WindowsStore\build\WindowsStore\WindowsStorePlatform.Windows\WindowsStorePlatform.Windows.vcxproj", "{EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsStorePlatform.WindowsPhone", "..\..\..\diligentcore\Platforms\WindowsStore\build\WindowsStore\WindowsStorePlatform.WindowsPhone\WindowsStorePlatform.WindowsPhone.vcxproj", "{E518043B-B99A-414F-A276-D93B0F263DF2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GraphicsEngineD3D11", "GraphicsEngineD3D11", "{DC6108A0-9FE3-46F5-B68A-15E7BA6BAC52}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngineD3D11.Shared", "..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems", "{3C22010C-99F3-4321-8F55-36DA8F97A980}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngineD3D11.Windows", "..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Windows\GraphicsEngineD3D11.Windows.vcxproj", "{3838FD2B-3C87-4CAF-95DE-95E7C3947C26}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsEngineD3D11.WindowsPhone", "..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.WindowsPhone\GraphicsEngineD3D11.WindowsPhone.vcxproj", "{581C72CF-7F31-4EBA-8F6E-743CA5774742}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GraphicsTools", "GraphicsTools", "{1BAA16B3-EE0C-43BC-A099-4AC98392FE0B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsTools.Shared", "..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems", "{3BB4F2AC-1D2F-4AF6-B9CC-BDC17BB8BC39}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsTools.Windows", "..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Windows\GraphicsTools.Windows.vcxproj", "{DAC331F3-C5A2-4568-8714-9213C3487A49}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsTools.WindowsPhone", "..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.WindowsPhone\GraphicsTools.WindowsPhone.vcxproj", "{2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformInterface.Shared", "..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems", "{C8F281ED-F3B9-4C24-A2D3-40A922363466}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderScript.Shared", "..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems", "{AC843CD8-70C4-4BF9-BBFB-BB8E5979F81E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderScript.Windows", "..\..\RenderScript\build\WindowsStore\RenderScript.Windows\RenderScript.Windows.vcxproj", "{1911BC2F-D78F-49C7-8847-B10B333DA85A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderScript.WindowsPhone", "..\..\RenderScript\build\WindowsStore\RenderScript.WindowsPhone\RenderScript.WindowsPhone.vcxproj", "{C6D20522-F184-47E4-AFA0-31341A71495F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RenderScript", "RenderScript", "{F8AFAE79-9696-42A3-9770-A4A56DCCCEDA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TextureLoader", "TextureLoader", "{B3289B68-6D57-4D90-91FC-B4E0B83D7FAB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureLoader.Shared", "..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems", "{149D2147-99EC-471E-A8CF-D894E0D11EDA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureLoader.Windows", "..\..\TextureLoader\build\WindowsStore\TextureLoader.Windows\TextureLoader.Windows.vcxproj", "{742B0D32-3535-4382-BE47-65C179CD544C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextureLoader.WindowsPhone", "..\..\TextureLoader\build\WindowsStore\TextureLoader.WindowsPhone\TextureLoader.WindowsPhone.vcxproj", "{D12EAF5B-1FEE-4740-8EC3-7240760211B9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{B2403706-1B5A-45FC-AED8-5AFAA61A7B42}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libjpeg", "libjpeg", "{757D9271-A978-4A30-8FE3-EEAC57D4704E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libtiff", "libtiff", "{EA6F3423-0F5A-4ED0-BD45-2E9DB4289DE1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libpng", "libpng", "{322F7510-86D7-4053-825E-F831CD2AFFF5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lua", "lua", "{D0F4C668-95A0-4439-A310-C140081C9102}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zlib", "zlib", "{97E309F7-B648-469D-AC04-0EB7E74DFD27}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg.Shared", "..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems", "{E0CA2A6C-095A-454E-B566-31E81D91615D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg.Windows", "..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Windows\libjpeg.Windows.vcxproj", "{3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg.WindowsPhone", "..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.WindowsPhone\libjpeg.WindowsPhone.vcxproj", "{78F7ACD1-114D-483D-B92A-BAB53519F0D5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng.Shared", "..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems", "{8C6B12D1-7972-451F-A612-E7AC3443CB72}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng.Windows", "..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Windows\LibPng.Windows.vcxproj", "{F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng.WindowsPhone", "..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.WindowsPhone\LibPng.WindowsPhone.vcxproj", "{ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibTiff.Shared", "..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems", "{0E12BAA7-7B7D-406F-8374-075598833B2A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibTiff.Windows", "..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Windows\LibTiff.Windows.vcxproj", "{E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibTiff.WindowsPhone", "..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.WindowsPhone\LibTiff.WindowsPhone.vcxproj", "{C589BB57-4E44-42E9-A77E-827F5E68EEDB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua.Shared", "..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems", "{4703C34C-1A7F-4BB2-8FF8-007C55C015D5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua.Windows", "..\..\External\lua-5.2.3\build\WindowsStore\Lua.Windows\Lua.Windows.vcxproj", "{5110A62B-172F-48FE-A268-4931577D9AAD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Lua.WindowsPhone", "..\..\External\lua-5.2.3\build\WindowsStore\Lua.WindowsPhone\Lua.WindowsPhone.vcxproj", "{6536C1F5-4EA4-49A3-92F1-810C4750BF10}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib.Shared", "..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems", "{40CCCED6-03E5-4CA9-A235-990C055DFE70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib.Windows", "..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Windows\zlib.Windows.vcxproj", "{E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib.WindowsPhone", "..\..\External\zlib-1.2.8\build\WindowsStore\zlib.WindowsPhone\zlib.WindowsPhone.vcxproj", "{FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}" -EndProject -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\..\diligentcore\Platforms\WindowsStore\build\WindowsStore\WindowsStorePlatform.Shared\WindowsStorePlatform.Shared.vcxitems*{e518043b-b99a-414f-a276-d93b0f263df2}*SharedItemsImports = 4 - ..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems*{8b4477c9-e00b-48ce-bd60-ed694593cd85}*SharedItemsImports = 4 - ..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems*{f6f756f0-2704-4cb8-b2b2-56f09d0e23e8}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems*{dac331f3-c5a2-4568-8714-9213c3487a49}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems*{3838fd2b-3c87-4caf-95de-95e7c3947c26}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems*{3c22010c-99f3-4321-8f55-36da8f97a980}*SharedItemsImports = 9 - ..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems*{3bb4f2ac-1d2f-4af6-b9cc-bdc17bb8bc39}*SharedItemsImports = 9 - ..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems*{9df5553c-ca9d-4cb6-a06a-ca905119c00b}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\WindowsStore\build\WindowsStore\WindowsStorePlatform.Shared\WindowsStorePlatform.Shared.vcxitems*{eba5d25b-265d-4936-92c3-6ee01bf1b6d7}*SharedItemsImports = 4 - ..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems*{6536c1f5-4ea4-49a3-92f1-810c4750bf10}*SharedItemsImports = 4 - ..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems*{faa06bfc-3248-4338-97c4-7a1ca6db7c9c}*SharedItemsImports = 4 - ..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems*{d12eaf5b-1fee-4740-8ec3-7240760211b9}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems*{0cdd843c-089d-4fee-be9f-c08fa2b51acb}*SharedItemsImports = 9 - ..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems*{78f7acd1-114d-483d-b92a-bab53519f0d5}*SharedItemsImports = 4 - ..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems*{e0ca2a6c-095a-454e-b566-31e81d91615d}*SharedItemsImports = 9 - ..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems*{40ccced6-03e5-4ca9-a235-990c055dfe70}*SharedItemsImports = 9 - ..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems*{3f28c683-66ad-42ca-a264-b18d0743f518}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems*{3f28c683-66ad-42ca-a264-b18d0743f518}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsEngine\build\WindowsStore\GraphicsEngine.Shared\GraphicsEngine.Shared.vcxitems*{aefba9a8-e16d-4b06-b16d-bc74ac799b4f}*SharedItemsImports = 4 - ..\..\External\libjpeg-9a\build\WindowsStore\libjpeg.Shared\libjpeg.Shared.vcxitems*{3cce7ebc-96c9-4f40-8983-5c99f584b3b1}*SharedItemsImports = 4 - ..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems*{4f9e9c58-6840-4f2f-a456-dd039fc790a4}*SharedItemsImports = 4 - ..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems*{e9e719dd-05cf-4ad2-ac3b-1035ddadbb56}*SharedItemsImports = 4 - ..\..\External\zlib-1.2.8\build\WindowsStore\zlib.Shared\zlib.Shared.vcxitems*{e9b3069f-ca6c-4c5c-91b6-df112c5b290e}*SharedItemsImports = 4 - ..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems*{c6d20522-f184-47e4-afa0-31341a71495f}*SharedItemsImports = 4 - ..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems*{c589bb57-4e44-42e9-a77e-827f5e68eedb}*SharedItemsImports = 4 - ..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems*{5110a62b-172f-48fe-a268-4931577d9aad}*SharedItemsImports = 4 - ..\..\..\diligentcore\Graphics\GraphicsTools\build\WindowsStore\GraphicsTools.Shared\GraphicsTools.Shared.vcxitems*{2f340c0e-43b2-471f-b4f3-7cdce69f6e1f}*SharedItemsImports = 4 - ..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems*{8c6b12d1-7972-451f-a612-e7ac3443cb72}*SharedItemsImports = 9 - ..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems*{742b0d32-3535-4382-be47-65c179cd544c}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\WindowsStore\build\WindowsStore\WindowsStorePlatform.Shared\WindowsStorePlatform.Shared.vcxitems*{65c1955f-c69e-4185-8b89-864725706a36}*SharedItemsImports = 9 - ..\..\External\lpng-1.6.17\build\WindowsStore\LibPng.Shared\LibPng.Shared.vcxitems*{adf2ffd9-7dd1-49d7-b79c-f7c8f21efa3a}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems*{c50f6528-6a12-49a9-bec0-e07cf153fca8}*SharedItemsImports = 9 - ..\..\..\diligentcore\Graphics\GraphicsEngineD3D11\build\WindowsStore\GraphicsEngineD3D11.Shared\GraphicsEngineD3D11.Shared.vcxitems*{581c72cf-7f31-4eba-8f6e-743ca5774742}*SharedItemsImports = 4 - ..\..\TextureLoader\build\WindowsStore\TextureLoader.Shared\TextureLoader.Shared.vcxitems*{149d2147-99ec-471e-a8cf-d894e0d11eda}*SharedItemsImports = 9 - ..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems*{6b4cf863-1024-45e2-ba7e-263de516468b}*SharedItemsImports = 4 - ..\..\..\diligentcore\Platforms\Basic\build\WindowsStore\BasicPlatform.Shared\BasicPlatform.Shared.vcxitems*{6b4cf863-1024-45e2-ba7e-263de516468b}*SharedItemsImports = 4 - ..\..\External\lua-5.2.3\build\WindowsStore\Lua.Shared\Lua.Shared.vcxitems*{4703c34c-1a7f-4bb2-8ff8-007c55c015d5}*SharedItemsImports = 9 - ..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems*{ac843cd8-70c4-4bf9-bbfb-bb8e5979f81e}*SharedItemsImports = 9 - ..\..\External\libtiff-4.0.3\build\WindowsStore\LibTiff.Shared\LibTiff.Shared.vcxitems*{0e12baa7-7b7d-406f-8374-075598833b2a}*SharedItemsImports = 9 - ..\..\..\diligentcore\Platforms\interface\build\WindowsStore\PlatformInterface.Shared.vcxitems*{c8f281ed-f3b9-4c24-a2d3-40a922363466}*SharedItemsImports = 9 - ..\..\..\diligentcore\Common\build\WindowsStore\Common.Shared\Common.Shared.vcxitems*{d716bf4d-094b-47d7-9137-a01c690c3616}*SharedItemsImports = 9 - ..\..\RenderScript\build\WindowsStore\RenderScript.Shared\RenderScript.Shared.vcxitems*{1911bc2f-d78f-49c7-8847-b10b333da85a}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Debug|ARM.ActiveCfg = Debug|ARM - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Debug|ARM.Build.0 = Debug|ARM - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Debug|Win32.ActiveCfg = Debug|Win32 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Debug|Win32.Build.0 = Debug|Win32 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Debug|x64.ActiveCfg = Debug|x64 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Debug|x64.Build.0 = Debug|x64 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Release|ARM.ActiveCfg = Release|ARM - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Release|ARM.Build.0 = Release|ARM - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Release|Win32.ActiveCfg = Release|Win32 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Release|Win32.Build.0 = Release|Win32 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Release|x64.ActiveCfg = Release|x64 - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B}.Release|x64.Build.0 = Release|x64 - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Debug|ARM.ActiveCfg = Debug|ARM - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Debug|ARM.Build.0 = Debug|ARM - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Debug|Win32.ActiveCfg = Debug|Win32 - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Debug|Win32.Build.0 = Debug|Win32 - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Debug|x64.ActiveCfg = Debug|Win32 - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Release|ARM.ActiveCfg = Release|ARM - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Release|ARM.Build.0 = Release|ARM - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Release|Win32.ActiveCfg = Release|Win32 - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Release|Win32.Build.0 = Release|Win32 - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F}.Release|x64.ActiveCfg = Release|Win32 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Debug|ARM.ActiveCfg = Debug|ARM - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Debug|ARM.Build.0 = Debug|ARM - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Debug|Win32.Build.0 = Debug|Win32 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Debug|x64.ActiveCfg = Debug|x64 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Debug|x64.Build.0 = Debug|x64 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Release|ARM.ActiveCfg = Release|ARM - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Release|ARM.Build.0 = Release|ARM - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Release|Win32.ActiveCfg = Release|Win32 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Release|Win32.Build.0 = Release|Win32 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Release|x64.ActiveCfg = Release|x64 - {4F9E9C58-6840-4F2F-A456-DD039FC790A4}.Release|x64.Build.0 = Release|x64 - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Debug|ARM.ActiveCfg = Debug|ARM - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Debug|ARM.Build.0 = Debug|ARM - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Debug|Win32.Build.0 = Debug|Win32 - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Debug|x64.ActiveCfg = Debug|Win32 - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Release|ARM.ActiveCfg = Release|ARM - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Release|ARM.Build.0 = Release|ARM - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Release|Win32.ActiveCfg = Release|Win32 - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Release|Win32.Build.0 = Release|Win32 - {8B4477C9-E00B-48CE-BD60-ED694593CD85}.Release|x64.ActiveCfg = Release|Win32 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Debug|ARM.ActiveCfg = Debug|ARM - {3F28C683-66AD-42CA-A264-B18D0743F518}.Debug|ARM.Build.0 = Debug|ARM - {3F28C683-66AD-42CA-A264-B18D0743F518}.Debug|Win32.ActiveCfg = Debug|Win32 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Debug|Win32.Build.0 = Debug|Win32 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Debug|x64.ActiveCfg = Debug|x64 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Debug|x64.Build.0 = Debug|x64 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Release|ARM.ActiveCfg = Release|ARM - {3F28C683-66AD-42CA-A264-B18D0743F518}.Release|ARM.Build.0 = Release|ARM - {3F28C683-66AD-42CA-A264-B18D0743F518}.Release|Win32.ActiveCfg = Release|Win32 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Release|Win32.Build.0 = Release|Win32 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Release|x64.ActiveCfg = Release|x64 - {3F28C683-66AD-42CA-A264-B18D0743F518}.Release|x64.Build.0 = Release|x64 - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Debug|ARM.ActiveCfg = Debug|ARM - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Debug|ARM.Build.0 = Debug|ARM - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Debug|Win32.ActiveCfg = Debug|Win32 - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Debug|Win32.Build.0 = Debug|Win32 - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Debug|x64.ActiveCfg = Debug|Win32 - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Release|ARM.ActiveCfg = Release|ARM - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Release|ARM.Build.0 = Release|ARM - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Release|Win32.ActiveCfg = Release|Win32 - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Release|Win32.Build.0 = Release|Win32 - {6B4CF863-1024-45E2-BA7E-263DE516468B}.Release|x64.ActiveCfg = Release|Win32 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Debug|ARM.ActiveCfg = Debug|ARM - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Debug|ARM.Build.0 = Debug|ARM - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Debug|Win32.ActiveCfg = Debug|Win32 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Debug|Win32.Build.0 = Debug|Win32 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Debug|x64.ActiveCfg = Debug|x64 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Debug|x64.Build.0 = Debug|x64 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Release|ARM.ActiveCfg = Release|ARM - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Release|ARM.Build.0 = Release|ARM - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Release|Win32.ActiveCfg = Release|Win32 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Release|Win32.Build.0 = Release|Win32 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Release|x64.ActiveCfg = Release|x64 - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7}.Release|x64.Build.0 = Release|x64 - {E518043B-B99A-414F-A276-D93B0F263DF2}.Debug|ARM.ActiveCfg = Debug|ARM - {E518043B-B99A-414F-A276-D93B0F263DF2}.Debug|ARM.Build.0 = Debug|ARM - {E518043B-B99A-414F-A276-D93B0F263DF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {E518043B-B99A-414F-A276-D93B0F263DF2}.Debug|Win32.Build.0 = Debug|Win32 - {E518043B-B99A-414F-A276-D93B0F263DF2}.Debug|x64.ActiveCfg = Debug|Win32 - {E518043B-B99A-414F-A276-D93B0F263DF2}.Release|ARM.ActiveCfg = Release|ARM - {E518043B-B99A-414F-A276-D93B0F263DF2}.Release|ARM.Build.0 = Release|ARM - {E518043B-B99A-414F-A276-D93B0F263DF2}.Release|Win32.ActiveCfg = Release|Win32 - {E518043B-B99A-414F-A276-D93B0F263DF2}.Release|Win32.Build.0 = Release|Win32 - {E518043B-B99A-414F-A276-D93B0F263DF2}.Release|x64.ActiveCfg = Release|Win32 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Debug|ARM.ActiveCfg = Debug|ARM - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Debug|ARM.Build.0 = Debug|ARM - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Debug|Win32.ActiveCfg = Debug|Win32 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Debug|Win32.Build.0 = Debug|Win32 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Debug|x64.ActiveCfg = Debug|x64 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Debug|x64.Build.0 = Debug|x64 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Release|ARM.ActiveCfg = Release|ARM - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Release|ARM.Build.0 = Release|ARM - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Release|Win32.ActiveCfg = Release|Win32 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Release|Win32.Build.0 = Release|Win32 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Release|x64.ActiveCfg = Release|x64 - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26}.Release|x64.Build.0 = Release|x64 - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Debug|ARM.ActiveCfg = Debug|ARM - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Debug|ARM.Build.0 = Debug|ARM - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Debug|Win32.ActiveCfg = Debug|Win32 - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Debug|Win32.Build.0 = Debug|Win32 - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Debug|x64.ActiveCfg = Debug|Win32 - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Release|ARM.ActiveCfg = Release|ARM - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Release|ARM.Build.0 = Release|ARM - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Release|Win32.ActiveCfg = Release|Win32 - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Release|Win32.Build.0 = Release|Win32 - {581C72CF-7F31-4EBA-8F6E-743CA5774742}.Release|x64.ActiveCfg = Release|Win32 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Debug|ARM.ActiveCfg = Debug|ARM - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Debug|ARM.Build.0 = Debug|ARM - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Debug|Win32.ActiveCfg = Debug|Win32 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Debug|Win32.Build.0 = Debug|Win32 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Debug|x64.ActiveCfg = Debug|x64 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Debug|x64.Build.0 = Debug|x64 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Release|ARM.ActiveCfg = Release|ARM - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Release|ARM.Build.0 = Release|ARM - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Release|Win32.ActiveCfg = Release|Win32 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Release|Win32.Build.0 = Release|Win32 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Release|x64.ActiveCfg = Release|x64 - {DAC331F3-C5A2-4568-8714-9213C3487A49}.Release|x64.Build.0 = Release|x64 - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Debug|ARM.ActiveCfg = Debug|ARM - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Debug|ARM.Build.0 = Debug|ARM - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Debug|Win32.ActiveCfg = Debug|Win32 - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Debug|Win32.Build.0 = Debug|Win32 - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Debug|x64.ActiveCfg = Debug|Win32 - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Release|ARM.ActiveCfg = Release|ARM - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Release|ARM.Build.0 = Release|ARM - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Release|Win32.ActiveCfg = Release|Win32 - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Release|Win32.Build.0 = Release|Win32 - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F}.Release|x64.ActiveCfg = Release|Win32 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Debug|ARM.ActiveCfg = Debug|ARM - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Debug|ARM.Build.0 = Debug|ARM - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Debug|Win32.ActiveCfg = Debug|Win32 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Debug|Win32.Build.0 = Debug|Win32 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Debug|x64.ActiveCfg = Debug|x64 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Debug|x64.Build.0 = Debug|x64 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Release|ARM.ActiveCfg = Release|ARM - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Release|ARM.Build.0 = Release|ARM - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Release|Win32.ActiveCfg = Release|Win32 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Release|Win32.Build.0 = Release|Win32 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Release|x64.ActiveCfg = Release|x64 - {1911BC2F-D78F-49C7-8847-B10B333DA85A}.Release|x64.Build.0 = Release|x64 - {C6D20522-F184-47E4-AFA0-31341A71495F}.Debug|ARM.ActiveCfg = Debug|ARM - {C6D20522-F184-47E4-AFA0-31341A71495F}.Debug|ARM.Build.0 = Debug|ARM - {C6D20522-F184-47E4-AFA0-31341A71495F}.Debug|Win32.ActiveCfg = Debug|Win32 - {C6D20522-F184-47E4-AFA0-31341A71495F}.Debug|Win32.Build.0 = Debug|Win32 - {C6D20522-F184-47E4-AFA0-31341A71495F}.Debug|x64.ActiveCfg = Debug|Win32 - {C6D20522-F184-47E4-AFA0-31341A71495F}.Release|ARM.ActiveCfg = Release|ARM - {C6D20522-F184-47E4-AFA0-31341A71495F}.Release|ARM.Build.0 = Release|ARM - {C6D20522-F184-47E4-AFA0-31341A71495F}.Release|Win32.ActiveCfg = Release|Win32 - {C6D20522-F184-47E4-AFA0-31341A71495F}.Release|Win32.Build.0 = Release|Win32 - {C6D20522-F184-47E4-AFA0-31341A71495F}.Release|x64.ActiveCfg = Release|Win32 - {742B0D32-3535-4382-BE47-65C179CD544C}.Debug|ARM.ActiveCfg = Debug|ARM - {742B0D32-3535-4382-BE47-65C179CD544C}.Debug|ARM.Build.0 = Debug|ARM - {742B0D32-3535-4382-BE47-65C179CD544C}.Debug|Win32.ActiveCfg = Debug|Win32 - {742B0D32-3535-4382-BE47-65C179CD544C}.Debug|Win32.Build.0 = Debug|Win32 - {742B0D32-3535-4382-BE47-65C179CD544C}.Debug|x64.ActiveCfg = Debug|x64 - {742B0D32-3535-4382-BE47-65C179CD544C}.Debug|x64.Build.0 = Debug|x64 - {742B0D32-3535-4382-BE47-65C179CD544C}.Release|ARM.ActiveCfg = Release|ARM - {742B0D32-3535-4382-BE47-65C179CD544C}.Release|ARM.Build.0 = Release|ARM - {742B0D32-3535-4382-BE47-65C179CD544C}.Release|Win32.ActiveCfg = Release|Win32 - {742B0D32-3535-4382-BE47-65C179CD544C}.Release|Win32.Build.0 = Release|Win32 - {742B0D32-3535-4382-BE47-65C179CD544C}.Release|x64.ActiveCfg = Release|x64 - {742B0D32-3535-4382-BE47-65C179CD544C}.Release|x64.Build.0 = Release|x64 - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Debug|ARM.ActiveCfg = Debug|ARM - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Debug|ARM.Build.0 = Debug|ARM - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Debug|Win32.ActiveCfg = Debug|Win32 - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Debug|Win32.Build.0 = Debug|Win32 - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Debug|x64.ActiveCfg = Debug|Win32 - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Release|ARM.ActiveCfg = Release|ARM - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Release|ARM.Build.0 = Release|ARM - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Release|Win32.ActiveCfg = Release|Win32 - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Release|Win32.Build.0 = Release|Win32 - {D12EAF5B-1FEE-4740-8EC3-7240760211B9}.Release|x64.ActiveCfg = Release|Win32 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Debug|ARM.ActiveCfg = Debug|ARM - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Debug|ARM.Build.0 = Debug|ARM - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Debug|Win32.Build.0 = Debug|Win32 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Debug|x64.ActiveCfg = Debug|x64 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Debug|x64.Build.0 = Debug|x64 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Release|ARM.ActiveCfg = Release|ARM - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Release|ARM.Build.0 = Release|ARM - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Release|Win32.ActiveCfg = Release|Win32 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Release|Win32.Build.0 = Release|Win32 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Release|x64.ActiveCfg = Release|x64 - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1}.Release|x64.Build.0 = Release|x64 - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Debug|ARM.ActiveCfg = Debug|ARM - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Debug|ARM.Build.0 = Debug|ARM - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Debug|Win32.ActiveCfg = Debug|Win32 - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Debug|Win32.Build.0 = Debug|Win32 - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Debug|x64.ActiveCfg = Debug|Win32 - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Release|ARM.ActiveCfg = Release|ARM - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Release|ARM.Build.0 = Release|ARM - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Release|Win32.ActiveCfg = Release|Win32 - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Release|Win32.Build.0 = Release|Win32 - {78F7ACD1-114D-483D-B92A-BAB53519F0D5}.Release|x64.ActiveCfg = Release|Win32 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Debug|ARM.ActiveCfg = Debug|ARM - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Debug|ARM.Build.0 = Debug|ARM - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Debug|Win32.ActiveCfg = Debug|Win32 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Debug|Win32.Build.0 = Debug|Win32 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Debug|x64.ActiveCfg = Debug|x64 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Debug|x64.Build.0 = Debug|x64 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Release|ARM.ActiveCfg = Release|ARM - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Release|ARM.Build.0 = Release|ARM - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Release|Win32.ActiveCfg = Release|Win32 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Release|Win32.Build.0 = Release|Win32 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Release|x64.ActiveCfg = Release|x64 - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8}.Release|x64.Build.0 = Release|x64 - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Debug|ARM.ActiveCfg = Debug|ARM - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Debug|ARM.Build.0 = Debug|ARM - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Debug|Win32.ActiveCfg = Debug|Win32 - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Debug|Win32.Build.0 = Debug|Win32 - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Debug|x64.ActiveCfg = Debug|Win32 - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Release|ARM.ActiveCfg = Release|ARM - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Release|ARM.Build.0 = Release|ARM - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Release|Win32.ActiveCfg = Release|Win32 - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Release|Win32.Build.0 = Release|Win32 - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A}.Release|x64.ActiveCfg = Release|Win32 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Debug|ARM.ActiveCfg = Debug|ARM - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Debug|ARM.Build.0 = Debug|ARM - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Debug|Win32.Build.0 = Debug|Win32 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Debug|x64.ActiveCfg = Debug|x64 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Debug|x64.Build.0 = Debug|x64 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Release|ARM.ActiveCfg = Release|ARM - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Release|ARM.Build.0 = Release|ARM - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Release|Win32.ActiveCfg = Release|Win32 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Release|Win32.Build.0 = Release|Win32 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Release|x64.ActiveCfg = Release|x64 - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56}.Release|x64.Build.0 = Release|x64 - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Debug|ARM.ActiveCfg = Debug|ARM - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Debug|ARM.Build.0 = Debug|ARM - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Debug|Win32.ActiveCfg = Debug|Win32 - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Debug|Win32.Build.0 = Debug|Win32 - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Debug|x64.ActiveCfg = Debug|Win32 - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Release|ARM.ActiveCfg = Release|ARM - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Release|ARM.Build.0 = Release|ARM - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Release|Win32.ActiveCfg = Release|Win32 - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Release|Win32.Build.0 = Release|Win32 - {C589BB57-4E44-42E9-A77E-827F5E68EEDB}.Release|x64.ActiveCfg = Release|Win32 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Debug|ARM.ActiveCfg = Debug|ARM - {5110A62B-172F-48FE-A268-4931577D9AAD}.Debug|ARM.Build.0 = Debug|ARM - {5110A62B-172F-48FE-A268-4931577D9AAD}.Debug|Win32.ActiveCfg = Debug|Win32 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Debug|Win32.Build.0 = Debug|Win32 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Debug|x64.ActiveCfg = Debug|x64 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Debug|x64.Build.0 = Debug|x64 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Release|ARM.ActiveCfg = Release|ARM - {5110A62B-172F-48FE-A268-4931577D9AAD}.Release|ARM.Build.0 = Release|ARM - {5110A62B-172F-48FE-A268-4931577D9AAD}.Release|Win32.ActiveCfg = Release|Win32 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Release|Win32.Build.0 = Release|Win32 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Release|x64.ActiveCfg = Release|x64 - {5110A62B-172F-48FE-A268-4931577D9AAD}.Release|x64.Build.0 = Release|x64 - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Debug|ARM.ActiveCfg = Debug|ARM - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Debug|ARM.Build.0 = Debug|ARM - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Debug|Win32.ActiveCfg = Debug|Win32 - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Debug|Win32.Build.0 = Debug|Win32 - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Debug|x64.ActiveCfg = Debug|Win32 - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Release|ARM.ActiveCfg = Release|ARM - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Release|ARM.Build.0 = Release|ARM - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Release|Win32.ActiveCfg = Release|Win32 - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Release|Win32.Build.0 = Release|Win32 - {6536C1F5-4EA4-49A3-92F1-810C4750BF10}.Release|x64.ActiveCfg = Release|Win32 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Debug|ARM.ActiveCfg = Debug|ARM - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Debug|ARM.Build.0 = Debug|ARM - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Debug|Win32.ActiveCfg = Debug|Win32 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Debug|Win32.Build.0 = Debug|Win32 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Debug|x64.ActiveCfg = Debug|x64 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Debug|x64.Build.0 = Debug|x64 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Release|ARM.ActiveCfg = Release|ARM - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Release|ARM.Build.0 = Release|ARM - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Release|Win32.ActiveCfg = Release|Win32 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Release|Win32.Build.0 = Release|Win32 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Release|x64.ActiveCfg = Release|x64 - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E}.Release|x64.Build.0 = Release|x64 - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Debug|ARM.ActiveCfg = Debug|ARM - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Debug|ARM.Build.0 = Debug|ARM - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Debug|Win32.ActiveCfg = Debug|Win32 - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Debug|Win32.Build.0 = Debug|Win32 - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Debug|x64.ActiveCfg = Debug|Win32 - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Release|ARM.ActiveCfg = Release|ARM - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Release|ARM.Build.0 = Release|ARM - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Release|Win32.ActiveCfg = Release|Win32 - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Release|Win32.Build.0 = Release|Win32 - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {6D6ED57C-211D-400C-BB28-44BBFD0981F7} = {73304178-C768-4EED-B361-2C1979903E78} - {0CDD843C-089D-4FEE-BE9F-C08FA2B51ACB} = {6D6ED57C-211D-400C-BB28-44BBFD0981F7} - {9DF5553C-CA9D-4CB6-A06A-CA905119C00B} = {6D6ED57C-211D-400C-BB28-44BBFD0981F7} - {AEFBA9A8-E16D-4B06-B16D-BC74AC799B4F} = {6D6ED57C-211D-400C-BB28-44BBFD0981F7} - {9411517F-A716-4F79-BEFC-A21E2360C767} = {73304178-C768-4EED-B361-2C1979903E78} - {D716BF4D-094B-47D7-9137-A01C690C3616} = {9411517F-A716-4F79-BEFC-A21E2360C767} - {4F9E9C58-6840-4F2F-A456-DD039FC790A4} = {9411517F-A716-4F79-BEFC-A21E2360C767} - {8B4477C9-E00B-48CE-BD60-ED694593CD85} = {9411517F-A716-4F79-BEFC-A21E2360C767} - {78276F35-06BA-412C-AC96-04D2B9FC84F4} = {73304178-C768-4EED-B361-2C1979903E78} - {E9BE9596-934C-4336-888C-FDEF9D3FC610} = {78276F35-06BA-412C-AC96-04D2B9FC84F4} - {C50F6528-6A12-49A9-BEC0-E07CF153FCA8} = {E9BE9596-934C-4336-888C-FDEF9D3FC610} - {3F28C683-66AD-42CA-A264-B18D0743F518} = {E9BE9596-934C-4336-888C-FDEF9D3FC610} - {6B4CF863-1024-45E2-BA7E-263DE516468B} = {E9BE9596-934C-4336-888C-FDEF9D3FC610} - {EA965843-C00C-4401-9FE2-4E913B54BD9F} = {78276F35-06BA-412C-AC96-04D2B9FC84F4} - {65C1955F-C69E-4185-8B89-864725706A36} = {EA965843-C00C-4401-9FE2-4E913B54BD9F} - {EBA5D25B-265D-4936-92C3-6EE01BF1B6D7} = {EA965843-C00C-4401-9FE2-4E913B54BD9F} - {E518043B-B99A-414F-A276-D93B0F263DF2} = {EA965843-C00C-4401-9FE2-4E913B54BD9F} - {DC6108A0-9FE3-46F5-B68A-15E7BA6BAC52} = {73304178-C768-4EED-B361-2C1979903E78} - {3C22010C-99F3-4321-8F55-36DA8F97A980} = {DC6108A0-9FE3-46F5-B68A-15E7BA6BAC52} - {3838FD2B-3C87-4CAF-95DE-95E7C3947C26} = {DC6108A0-9FE3-46F5-B68A-15E7BA6BAC52} - {581C72CF-7F31-4EBA-8F6E-743CA5774742} = {DC6108A0-9FE3-46F5-B68A-15E7BA6BAC52} - {1BAA16B3-EE0C-43BC-A099-4AC98392FE0B} = {73304178-C768-4EED-B361-2C1979903E78} - {3BB4F2AC-1D2F-4AF6-B9CC-BDC17BB8BC39} = {1BAA16B3-EE0C-43BC-A099-4AC98392FE0B} - {DAC331F3-C5A2-4568-8714-9213C3487A49} = {1BAA16B3-EE0C-43BC-A099-4AC98392FE0B} - {2F340C0E-43B2-471F-B4F3-7CDCE69F6E1F} = {1BAA16B3-EE0C-43BC-A099-4AC98392FE0B} - {C8F281ED-F3B9-4C24-A2D3-40A922363466} = {78276F35-06BA-412C-AC96-04D2B9FC84F4} - {AC843CD8-70C4-4BF9-BBFB-BB8E5979F81E} = {F8AFAE79-9696-42A3-9770-A4A56DCCCEDA} - {1911BC2F-D78F-49C7-8847-B10B333DA85A} = {F8AFAE79-9696-42A3-9770-A4A56DCCCEDA} - {C6D20522-F184-47E4-AFA0-31341A71495F} = {F8AFAE79-9696-42A3-9770-A4A56DCCCEDA} - {149D2147-99EC-471E-A8CF-D894E0D11EDA} = {B3289B68-6D57-4D90-91FC-B4E0B83D7FAB} - {742B0D32-3535-4382-BE47-65C179CD544C} = {B3289B68-6D57-4D90-91FC-B4E0B83D7FAB} - {D12EAF5B-1FEE-4740-8EC3-7240760211B9} = {B3289B68-6D57-4D90-91FC-B4E0B83D7FAB} - {757D9271-A978-4A30-8FE3-EEAC57D4704E} = {B2403706-1B5A-45FC-AED8-5AFAA61A7B42} - {EA6F3423-0F5A-4ED0-BD45-2E9DB4289DE1} = {B2403706-1B5A-45FC-AED8-5AFAA61A7B42} - {322F7510-86D7-4053-825E-F831CD2AFFF5} = {B2403706-1B5A-45FC-AED8-5AFAA61A7B42} - {D0F4C668-95A0-4439-A310-C140081C9102} = {B2403706-1B5A-45FC-AED8-5AFAA61A7B42} - {97E309F7-B648-469D-AC04-0EB7E74DFD27} = {B2403706-1B5A-45FC-AED8-5AFAA61A7B42} - {E0CA2A6C-095A-454E-B566-31E81D91615D} = {757D9271-A978-4A30-8FE3-EEAC57D4704E} - {3CCE7EBC-96C9-4F40-8983-5C99F584B3B1} = {757D9271-A978-4A30-8FE3-EEAC57D4704E} - {78F7ACD1-114D-483D-B92A-BAB53519F0D5} = {757D9271-A978-4A30-8FE3-EEAC57D4704E} - {8C6B12D1-7972-451F-A612-E7AC3443CB72} = {322F7510-86D7-4053-825E-F831CD2AFFF5} - {F6F756F0-2704-4CB8-B2B2-56F09D0E23E8} = {322F7510-86D7-4053-825E-F831CD2AFFF5} - {ADF2FFD9-7DD1-49D7-B79C-F7C8F21EFA3A} = {322F7510-86D7-4053-825E-F831CD2AFFF5} - {0E12BAA7-7B7D-406F-8374-075598833B2A} = {EA6F3423-0F5A-4ED0-BD45-2E9DB4289DE1} - {E9E719DD-05CF-4AD2-AC3B-1035DDADBB56} = {EA6F3423-0F5A-4ED0-BD45-2E9DB4289DE1} - {C589BB57-4E44-42E9-A77E-827F5E68EEDB} = {EA6F3423-0F5A-4ED0-BD45-2E9DB4289DE1} - {4703C34C-1A7F-4BB2-8FF8-007C55C015D5} = {D0F4C668-95A0-4439-A310-C140081C9102} - {5110A62B-172F-48FE-A268-4931577D9AAD} = {D0F4C668-95A0-4439-A310-C140081C9102} - {6536C1F5-4EA4-49A3-92F1-810C4750BF10} = {D0F4C668-95A0-4439-A310-C140081C9102} - {40CCCED6-03E5-4CA9-A235-990C055DFE70} = {97E309F7-B648-469D-AC04-0EB7E74DFD27} - {E9B3069F-CA6C-4C5C-91B6-DF112C5B290E} = {97E309F7-B648-469D-AC04-0EB7E74DFD27} - {FAA06BFC-3248-4338-97C4-7A1CA6DB7C9C} = {97E309F7-B648-469D-AC04-0EB7E74DFD27} - EndGlobalSection -EndGlobal -- cgit v1.2.3