diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-04-01 22:02:39 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-04-01 22:02:39 +0000 |
| commit | 6badd197cd08a6e83fe907ffb00077aa99ea4e00 (patch) | |
| tree | a5987e5b8e54a3afed38ca144c43eca1fb896eb4 | |
| parent | Updated core (diff) | |
| parent | Updated readme (diff) | |
| download | DiligentEngine-6badd197cd08a6e83fe907ffb00077aa99ea4e00.tar.gz DiligentEngine-6badd197cd08a6e83fe907ffb00077aa99ea4e00.zip | |
Merged master
174 files changed, 1263 insertions, 225 deletions
diff --git a/Common/NativeApp/src/UWP/App.cpp b/Common/NativeApp/src/UWP/App.cpp index 6767b49..e0af485 100644 --- a/Common/NativeApp/src/UWP/App.cpp +++ b/Common/NativeApp/src/UWP/App.cpp @@ -103,6 +103,12 @@ void App::SetWindow(CoreWindow^ window) window->Closed += ref new TypedEventHandler<CoreWindow^, CoreWindowEventArgs^>(this, &App::OnWindowClosed); + window->KeyDown += + ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &App::OnKeyDown); + + window->KeyUp += + ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &App::OnKeyUp); + DisplayInformation^ currentDisplayInformation = DisplayInformation::GetForCurrentView(); currentDisplayInformation->DpiChanged += @@ -243,6 +249,47 @@ void App::OnDisplayContentsInvalidated(DisplayInformation^ sender, Object^ args) GetDeviceResources()->ValidateDevice(); } +void App::OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args) +{ + auto Key = args->VirtualKey; + switch(Key) + { + case VirtualKey::Escape: + CoreApplication::Exit(); + break; + + case VirtualKey::Enter: + if(m_bShiftPressed) + { + auto applicationView = Windows::UI::ViewManagement::ApplicationView::GetForCurrentView(); + if (applicationView->IsFullScreenMode) + { + applicationView->ExitFullScreenMode(); + } + else + { + applicationView->TryEnterFullScreenMode(); + } + } + break; + + case VirtualKey::Shift: + m_bShiftPressed = true; + break; + } +} + +void App::OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args) +{ + auto Key = args->VirtualKey; + switch (Key) + { + case VirtualKey::Shift: + m_bShiftPressed = false; + break; + } +} + std::shared_ptr<DX::DeviceResources> App::GetDeviceResources() { if (m_deviceResources != nullptr && m_deviceResources->IsDeviceRemoved()) diff --git a/Common/NativeApp/src/UWP/App.h b/Common/NativeApp/src/UWP/App.h index b480a52..1b09441 100644 --- a/Common/NativeApp/src/UWP/App.h +++ b/Common/NativeApp/src/UWP/App.h @@ -57,11 +57,15 @@ namespace SampleApp void OnOrientationChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args); void OnDisplayContentsInvalidated(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args); + void OnKeyDown(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args); + void OnKeyUp(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args); + private: std::shared_ptr<DX::DeviceResources> GetDeviceResources(); std::unique_ptr<NativeAppBase> m_Main; std::shared_ptr<DX::DeviceResources> m_deviceResources; - bool m_windowClosed; - bool m_windowVisible; + bool m_windowClosed = false; + bool m_windowVisible = false; + bool m_bShiftPressed = false; }; } diff --git a/Common/NativeApp/src/Win32/WinMain.cpp b/Common/NativeApp/src/Win32/WinMain.cpp index 6b53082..ff6b3b2 100644 --- a/Common/NativeApp/src/Win32/WinMain.cpp +++ b/Common/NativeApp/src/Win32/WinMain.cpp @@ -109,9 +109,12 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE, LPSTR, int cmdShow) // Called every time the NativeNativeAppBase receives a message LRESULT CALLBACK MessageProc(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam) { - auto res = g_pTheApp->HandleWin32Message(wnd, message, wParam, lParam); - if (res != 0) - return res; + if(g_pTheApp) + { + auto res = g_pTheApp->HandleWin32Message(wnd, message, wParam, lParam); + if (res != 0) + return res; + } switch (message) { diff --git a/DiligentCore b/DiligentCore -Subproject c7493c14adadcadf00ec5c3e7711b2db8eb1c92 +Subproject 6ad135adcf100beb49ef380f2b93a7d234ddb71 diff --git a/DiligentSamples b/DiligentSamples -Subproject 7f5d28a88f90b983bcbca8b98267a412ecf5c56 +Subproject 2e2c04a7ff101cf0d8c6132de0b1e2e274bcdfb diff --git a/DiligentTools b/DiligentTools -Subproject 7c8b67fda40132b4378eb21a6b8ff45892a28a9 +Subproject 3800d79e3d5491340e22cbf237ec4b62b75545a diff --git a/Projects/Asteroids/src/asteroids_DE.cpp b/Projects/Asteroids/src/asteroids_DE.cpp index 296f05f..40d9db2 100644 --- a/Projects/Asteroids/src/asteroids_DE.cpp +++ b/Projects/Asteroids/src/asteroids_DE.cpp @@ -75,7 +75,7 @@ void Asteroids::InitDevice(HWND hWnd, DeviceType DevType) #endif auto *pFactoryD3D11 = GetEngineFactoryD3D11(); pFactoryD3D11->CreateDeviceAndContextsD3D11( DeviceAttribs, &mDevice, ppContexts.data(), mNumSubsets-1 ); - pFactoryD3D11->CreateSwapChainD3D11( mDevice, ppContexts[0], SwapChainDesc, hWnd, &mSwapChain ); + pFactoryD3D11->CreateSwapChainD3D11( mDevice, ppContexts[0], SwapChainDesc, FullScreenModeDesc{}, hWnd, &mSwapChain ); } else { @@ -92,7 +92,7 @@ void Asteroids::InitDevice(HWND hWnd, DeviceType DevType) #endif auto *pFactoryD3D12 = GetEngineFactoryD3D12(); pFactoryD3D12->CreateDeviceAndContextsD3D12( Attribs, &mDevice, ppContexts.data(), mNumSubsets-1 ); - pFactoryD3D12->CreateSwapChainD3D12( mDevice, ppContexts[0], SwapChainDesc, hWnd, &mSwapChain ); + pFactoryD3D12->CreateSwapChainD3D12( mDevice, ppContexts[0], SwapChainDesc, FullScreenModeDesc{}, hWnd, &mSwapChain ); } mDeviceCtxt.Attach(ppContexts[0]); @@ -769,6 +769,10 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting for(auto &cmdList : mCmdLists) { mDeviceCtxt->ExecuteCommandList(cmdList); + // Release command lists now to release all outstanding references + // In d3d11 mode, command lists hold references to the swap chain's back buffer + // that cause swap chain resize to fail + cmdList.Release(); } } @@ -843,7 +847,7 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting } } - mSwapChain->Present();//settings.vsync ? 1 : 0, 0); + mSwapChain->Present(settings.vsync ? 1 : 0); } void Asteroids::GetPerfCounters(float &UpdateTime, float &RenderTime) @@ -1,15 +1,15 @@ # Diligent Engine - A Modern Cross-Platform 3D Graphics Library -[Diligent Engine](http://diligentgraphics.com/diligent-engine/) is a light-weight cross-platform abstraction layer between the -application and the platform-specific graphics API. -Its main goal is to take advantages of the next-generation APIs such as Direct3D12 and Vulkan, but at the same time provide support -for older platforms via Direct3D11, OpenGL and OpenGLES. Diligent Engine exposes common front-end for all supported platforms and -provides [interoperability with underlying native API](http://diligentgraphics.com/diligent-engine/native-api-interoperability/). -[Shader source code converter](http://diligentgraphics.com/diligent-engine/shader-converter/) allows shaders authored in HLSL to -be translated to GLSL and used on all supported platforms. -The engine supports [integration with Unity](http://diligentgraphics.com/diligent-engine/integration-with-unity/) and is designed to be -used as a graphics subsystem in a standalone game engine, Unity native plugin or any other 3D application. It is distributed under -[Apache 2.0 license](License.txt) and is free to use. +[Diligent Engine](http://diligentgraphics.com/diligent-engine/) is a lightweight cross-platform abstraction layer between the +application and the platform-specific graphics API designed to take advantages of next-generation APIs such as +Direct3D12 and Vulkan, while providing support for older platforms via Direct3D11, OpenGL and OpenGLES. Diligent Engine exposes +common front-end for all supported platforms and provides +[interoperability with underlying native API](http://diligentgraphics.com/diligent-engine/native-api-interoperability/). +[Shader source code converter](http://diligentgraphics.com/diligent-engine/shader-converter/) allows HLSL shaders to be used +on all supported platforms and rendering backends. The engine is intended to be used as a graphics subsystem in a game engine +or any other 3D application, and supports +[integration with Unity](http://diligentgraphics.com/diligent-engine/integration-with-unity/). +Diligent Engine is distributed under [Apache 2.0 license](License.txt) and is free to use. ## Features @@ -409,6 +409,20 @@ and adds implementation using Diligent Engine API to allow comparing performance # Version History +## Current progress + +* Core: + * Implemented hardware adapter & display mode enumeration in D3D11 and D3D12 modes + * Implemented initialization in fullscreen mode as well as toggling between fullscreen and windowed modes in run time + * Added sync interval parameter to ISwapChain::Present() +* Samples: + * Added fullscreen mode selection dialog box + * Implemented fullscreen mode toggle on UWP with shift + enter + * Implemented fullscreen window toggle on Win32 with alt + enter +* Fixed the following issues: + * [Add option to redirect diligent error messages](https://github.com/DiligentGraphics/DiligentEngine/issues/9) + * [Add ability to run in exclusive fullscreen/vsync mode](https://github.com/DiligentGraphics/DiligentEngine/issues/10) + ## v2.2.a * Enabled Win32 build targeting Windows 8.1 SDK diff --git a/Tests/IncludeTest/CMakeLists.txt b/Tests/IncludeTest/CMakeLists.txt index 85e3289..34ec85d 100644 --- a/Tests/IncludeTest/CMakeLists.txt +++ b/Tests/IncludeTest/CMakeLists.txt @@ -4,7 +4,10 @@ project(IncludeTest) file(GLOB GRAPHICS_ENGINE_INC_TEST LIST_DIRECTORIES false src/GraphicsEngine/*.cpp) file(GLOB PLATFORMS_INC_TEST LIST_DIRECTORIES false src/Platforms/*.cpp) -add_library(IncludeTest ${GRAPHICS_ENGINE_INC_TEST} ${PLATFORMS_INC_TEST}) +file(GLOB COMMON_INC_TEST LIST_DIRECTORIES false src/Common/*.cpp) +file(GLOB GRAPHICS_TOOLS_INC_TEST LIST_DIRECTORIES false src/GraphicsTools/*.cpp) +file(GLOB TEXTURE_LOADER_INC_TEST LIST_DIRECTORIES false src/TextureLoader/*.cpp) +add_library(IncludeTest ${GRAPHICS_ENGINE_INC_TEST} ${PLATFORMS_INC_TEST} ${COMMON_INC_TEST} ${GRAPHICS_TOOLS_INC_TEST} ${TEXTURE_LOADER_INC_TEST}) if(D3D11_SUPPORTED) file(GLOB GRAPHICS_ENGINE_D3D11_INC_TEST LIST_DIRECTORIES false src/GraphicsEngineD3D11/*.cpp) @@ -24,7 +27,7 @@ if(GL_SUPPORTED OR GLES_SUPPORTED) source_group("src\\GraphicsEngineOpenGL" FILES ${GRAPHICS_ENGINE_GL_INC_TEST}) endif() -target_include_directories(IncludeTest PRIVATE ../../DiligentCore) +target_include_directories(IncludeTest PRIVATE ../..) target_link_libraries(IncludeTest PRIVATE BuildSettings) set_common_target_properties(IncludeTest) @@ -36,7 +39,9 @@ endif() source_group("src\\GraphicsEngine" FILES ${GRAPHICS_ENGINE_INC_TEST}) source_group("src\\Platforms" FILES ${PLATFORMS_INC_TEST}) - +source_group("src\\Common" FILES ${COMMON_INC_TEST}) +source_group("src\\GraphicsTool" FILES ${GRAPHICS_TOOLS_INC_TEST}) +source_group("src\\TextureLoader" FILES ${TEXTURE_LOADER_INC_TEST}) set_target_properties(IncludeTest PROPERTIES FOLDER Tests diff --git a/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp new file mode 100644 index 0000000..e9114a7 --- /dev/null +++ b/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/AdaptiveFixedBlockAllocator.h" diff --git a/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp b/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp new file mode 100644 index 0000000..168ebb4 --- /dev/null +++ b/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/AdvancedMath.h" diff --git a/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp b/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp new file mode 100644 index 0000000..252a25d --- /dev/null +++ b/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/BasicFileStream.h" diff --git a/Tests/IncludeTest/src/Common/BasicMathH_test.cpp b/Tests/IncludeTest/src/Common/BasicMathH_test.cpp new file mode 100644 index 0000000..8846a5a --- /dev/null +++ b/Tests/IncludeTest/src/Common/BasicMathH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/BasicMath.h" diff --git a/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp b/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp new file mode 100644 index 0000000..f43a1c6 --- /dev/null +++ b/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/DataBlobImpl.h" diff --git a/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp new file mode 100644 index 0000000..b07b218 --- /dev/null +++ b/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/DefaultRawMemoryAllocator.h" diff --git a/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp b/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp new file mode 100644 index 0000000..3e67b09 --- /dev/null +++ b/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/FileWrapper.h" diff --git a/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp new file mode 100644 index 0000000..8cd5482 --- /dev/null +++ b/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/FixedBlockMemoryAllocator.h" diff --git a/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp b/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp new file mode 100644 index 0000000..0123479 --- /dev/null +++ b/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/HashUtils.h" diff --git a/Tests/IncludeTest/src/Common/LockHelperH_test.cpp b/Tests/IncludeTest/src/Common/LockHelperH_test.cpp new file mode 100644 index 0000000..22952cf --- /dev/null +++ b/Tests/IncludeTest/src/Common/LockHelperH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/LockHelper.h" diff --git a/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp b/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp new file mode 100644 index 0000000..80fded4 --- /dev/null +++ b/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/ObjectBase.h" diff --git a/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp b/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp new file mode 100644 index 0000000..dce3b3f --- /dev/null +++ b/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/RefCntAutoPtr.h" diff --git a/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp b/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp new file mode 100644 index 0000000..bb21250 --- /dev/null +++ b/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/RefCountedObjectImpl.h" diff --git a/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp new file mode 100644 index 0000000..1d861db --- /dev/null +++ b/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/STDAllocator.h" diff --git a/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp b/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp new file mode 100644 index 0000000..2e7233a --- /dev/null +++ b/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/StringDataBlobImpl.h" diff --git a/Tests/IncludeTest/src/Common/StringToolsH_test.cpp b/Tests/IncludeTest/src/Common/StringToolsH_test.cpp new file mode 100644 index 0000000..4205ce1 --- /dev/null +++ b/Tests/IncludeTest/src/Common/StringToolsH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/StringTools.h" diff --git a/Tests/IncludeTest/src/Common/TimerH_test.cpp b/Tests/IncludeTest/src/Common/TimerH_test.cpp new file mode 100644 index 0000000..1f43a36 --- /dev/null +++ b/Tests/IncludeTest/src/Common/TimerH_test.cpp @@ -0,0 +1,25 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/Timer.h" + diff --git a/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp b/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp new file mode 100644 index 0000000..2a9503b --- /dev/null +++ b/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp @@ -0,0 +1,25 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/UniqueIdentifier.h" + diff --git a/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp b/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp new file mode 100644 index 0000000..7a0d2ad --- /dev/null +++ b/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Common/interface/ValidatedCast.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp index 3936e0b..32f0cec 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/BlendState.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/BlendState.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp index 689f936..fff4653 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/Buffer.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp index a14fc10..3d4dfc9 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/BufferView.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngine/interface/BufferView.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp index ebaf986..33a1366 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/CommandList.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngine/interface/CommandList.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp index 1d9bb29..ea8bdfd 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/Constants.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/Constants.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp index db67046..7716c01 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/DepthStencilState.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/DepthStencilState.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp index ca579ee..1153d3b 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/DeviceCaps.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceCaps.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp index 50068db..ff2f690 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/DeviceContext.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp index 326253f..602dc0c 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/DeviceObject.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceObject.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp index ba7b2b7..b978c4c 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/GraphicsTypes.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypes.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp index 0923834..d04f074 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/InputLayout.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/InputLayout.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp index bbc82f3..7e48048 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/MapHelper.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/MapHelper.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp index 31791c4..84190f9 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/PipelineState.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/PipelineState.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp index 5c49789..72d141f 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/RasterizerState.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/RasterizerState.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp index f74b088..ddd4bc6 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/RenderDevice.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp index bc64238..f18701b 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,5 +21,5 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/ResourceMapping.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/ResourceMapping.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp index 0cb07c6..6a0b2f7 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/Sampler.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/Sampler.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp index aa674db..8449f02 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/Shader.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/Shader.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp index 59e3e08..63a665b 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/ShaderResourceBinding.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp index dd72d4d..fda88ea 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/SwapChain.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngine/interface/SwapChain.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp index 447f3e3..2e47134 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/Texture.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/Texture.h" diff --git a/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp index bb5d4f8..444d091 100644 --- a/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngine/interface/TextureView.h" +#include "DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp index 631d67e..9336f24 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp index 8c377ec..79c60fe 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp index 9eb6b12..fc360ce 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp index 427ea4e..81881e6 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp index 7999874..565cc5f 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp index 866efc2..fa55f84 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp index d23e47f..6f7b0e2 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,4 +30,4 @@ # define ENGINE_DLL 1 #endif -#include "Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp index 062cf40..39b72b8 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp index 775b58e..12acfc9 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp index 12a8df1..ca91da0 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp index cd8f187..e60708b 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp index 751360b..9655d2b 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp index 2e9a3cb..775dc89 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d11.h> -#include "Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp index 943a7b6..0fca3db 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp index 4a78eb5..674284e 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp index 4a78eb5..674284e 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp index 39917a8..b82e29c 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp index e739e0e..ccfef4a 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp index f54b82c..d0c0559 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp index c30af3b..a7cf1c4 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,4 +30,4 @@ # define ENGINE_DLL 1 #endif -#include "Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp index 4d9b093..76eb398 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp index 4856387..3bcacdf 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp index d20c865..8ffdd2e 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp index 125a49e..7819ce4 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp index 73f4513..8d0f5eb 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp index 5065286..f124c62 100644 --- a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ #include <d3d12.h> -#include "Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h" +#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp index 0d7f54f..3249b87 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp index d29b2e1..c731193 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ typedef unsigned int GLuint; -#include "Graphics/GraphicsEngineOpenGL/interface/BufferGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp index 65ed13f..93cd469 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp index 57839ac..f883fca 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp index 57839ac..f883fca 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp index cc84715..75e94de 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp index 09a64c8..bce6a7b 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,4 +32,4 @@ # define ENGINE_DLL 1 #endif -#include "Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp index e5be6ae..119bb87 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp index 9f6b8ad..071c03e 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp index c93803b..b812f30 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp index 987c0e2..f2fec06 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,4 +20,4 @@ * all other commercial damages or losses), even if such Contributor has been advised * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp index ff82a09..57da8f7 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ typedef unsigned int GLuint; -#include "Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
\ No newline at end of file +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp index 15a59e1..0c57f2c 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,4 +22,4 @@ */ typedef unsigned int GLuint; typedef unsigned int GLenum; -#include "Graphics/GraphicsEngineOpenGL/interface/TextureGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h" diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp index 878d5f8..74398ef 100644 --- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp +++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h" +#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h" diff --git a/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp new file mode 100644 index 0000000..ebca682 --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h" diff --git a/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp new file mode 100644 index 0000000..45b7319 --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Graphics/GraphicsTools/include/CommonlyUsedStates.h" diff --git a/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp new file mode 100644 index 0000000..a75edab --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Graphics/GraphicsTools/include/GraphicsUtilities.h" diff --git a/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp new file mode 100644 index 0000000..e7c5496 --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Graphics/GraphicsTools/include/ShaderMacroHelper.h" diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp new file mode 100644 index 0000000..4b0f26a --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderBase.h" diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp new file mode 100644 index 0000000..b6abc9b --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp @@ -0,0 +1,26 @@ +/* Copyright 2015-2018 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. + */ + +#if D3D11_SUPPORTED +#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D11.h" +#endif diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp new file mode 100644 index 0000000..80f6c01 --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp @@ -0,0 +1,26 @@ +/* Copyright 2015-2018 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. + */ + +#if D3D12_SUPPORTED +#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D12.h" +#endif
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp new file mode 100644 index 0000000..62947d6 --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp @@ -0,0 +1,26 @@ +/* Copyright 2015-2018 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. + */ + +#if GL_SUPPORTED || GLES_SUPPORTED +#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderGL.h" +#endif
\ No newline at end of file diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp new file mode 100644 index 0000000..4716de2 --- /dev/null +++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentCore/Graphics/GraphicsTools/include/TextureUploader.h" diff --git a/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp b/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp index 4866152..d006d34 100644 --- a/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp +++ b/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Platforms/interface/Atomics.h" +#include "DiligentCore/Platforms/interface/Atomics.h" diff --git a/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp b/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp index d1d6433..c95560f 100644 --- a/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp +++ b/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Platforms/interface/FileSystem.h" +#include "DiligentCore/Platforms/interface/FileSystem.h" diff --git a/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp b/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp index b0d7cbd..00211df 100644 --- a/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp +++ b/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Platforms/interface/PlatformDebug.h" +#include "DiligentCore/Platforms/interface/PlatformDebug.h" diff --git a/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp b/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp index 33c5e25..5e0f1fa 100644 --- a/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp +++ b/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Platforms/interface/PlatformDefinitions.h" +#include "DiligentCore/Platforms/interface/PlatformDefinitions.h" diff --git a/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp b/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp index 11eb55a..001e272 100644 --- a/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp +++ b/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,4 +21,4 @@ * of the possibility of such damages. */ -#include "Platforms/interface/PlatformMisc.h" +#include "DiligentCore/Platforms/interface/PlatformMisc.h" diff --git a/Tests/IncludeTest/src/TextureLoader/ImageH_test.cpp b/Tests/IncludeTest/src/TextureLoader/ImageH_test.cpp new file mode 100644 index 0000000..47e9595 --- /dev/null +++ b/Tests/IncludeTest/src/TextureLoader/ImageH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentTools/TextureLoader/interface/Image.h" diff --git a/Tests/IncludeTest/src/TextureLoader/TextureLoaderH_test.cpp b/Tests/IncludeTest/src/TextureLoader/TextureLoaderH_test.cpp new file mode 100644 index 0000000..52d9ca1 --- /dev/null +++ b/Tests/IncludeTest/src/TextureLoader/TextureLoaderH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentTools/TextureLoader/interface/TextureLoader.h" diff --git a/Tests/IncludeTest/src/TextureLoader/TextureUtilitiesH_test.cpp b/Tests/IncludeTest/src/TextureLoader/TextureUtilitiesH_test.cpp new file mode 100644 index 0000000..5f9211e --- /dev/null +++ b/Tests/IncludeTest/src/TextureLoader/TextureUtilitiesH_test.cpp @@ -0,0 +1,24 @@ +/* Copyright 2015-2018 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 "DiligentTools/TextureLoader/interface/TextureUtilities.h" diff --git a/Tests/TestApp/include/AllocatorTest.h b/Tests/TestApp/include/AllocatorTest.h index f24a97c..dfa6eb1 100644 --- a/Tests/TestApp/include/AllocatorTest.h +++ b/Tests/TestApp/include/AllocatorTest.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/MTResourceCreationTest.h b/Tests/TestApp/include/MTResourceCreationTest.h index 6073c65..2376e21 100644 --- a/Tests/TestApp/include/MTResourceCreationTest.h +++ b/Tests/TestApp/include/MTResourceCreationTest.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/RenderScriptTest.h b/Tests/TestApp/include/RenderScriptTest.h index 8675c0d..1d8ff53 100644 --- a/Tests/TestApp/include/RenderScriptTest.h +++ b/Tests/TestApp/include/RenderScriptTest.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/ShaderConverterTest.h b/Tests/TestApp/include/ShaderConverterTest.h index 4b90a26..fdcdb0e 100644 --- a/Tests/TestApp/include/ShaderConverterTest.h +++ b/Tests/TestApp/include/ShaderConverterTest.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/SmartPointerTest.h b/Tests/TestApp/include/SmartPointerTest.h index 5d7407a..f205246 100644 --- a/Tests/TestApp/include/SmartPointerTest.h +++ b/Tests/TestApp/include/SmartPointerTest.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestBlendState.h b/Tests/TestApp/include/TestBlendState.h index a7fd655..fd47a92 100644 --- a/Tests/TestApp/include/TestBlendState.h +++ b/Tests/TestApp/include/TestBlendState.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestBrokenShader.h b/Tests/TestApp/include/TestBrokenShader.h new file mode 100644 index 0000000..ad53fca --- /dev/null +++ b/Tests/TestApp/include/TestBrokenShader.h @@ -0,0 +1,33 @@ +/* Copyright 2015-2018 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 "UnitTestBase.h" + +class TestBrokenShader : public UnitTestBase +{ +public: + TestBrokenShader(Diligent::IRenderDevice *pDevice); + +}; diff --git a/Tests/TestApp/include/TestBufferAccess.h b/Tests/TestApp/include/TestBufferAccess.h index b864960..76d18f7 100644 --- a/Tests/TestApp/include/TestBufferAccess.h +++ b/Tests/TestApp/include/TestBufferAccess.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestBufferCreation.h b/Tests/TestApp/include/TestBufferCreation.h index 644606b..114ed61 100644 --- a/Tests/TestApp/include/TestBufferCreation.h +++ b/Tests/TestApp/include/TestBufferCreation.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestComputeShaders.h b/Tests/TestApp/include/TestComputeShaders.h index 797b39d..38bf64e 100644 --- a/Tests/TestApp/include/TestComputeShaders.h +++ b/Tests/TestApp/include/TestComputeShaders.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestCopyTexData.h b/Tests/TestApp/include/TestCopyTexData.h index 913ea35..46715ab 100644 --- a/Tests/TestApp/include/TestCopyTexData.h +++ b/Tests/TestApp/include/TestCopyTexData.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestCreateObjFromNativeRes.h b/Tests/TestApp/include/TestCreateObjFromNativeRes.h index 1e9b335..b12a81e 100644 --- a/Tests/TestApp/include/TestCreateObjFromNativeRes.h +++ b/Tests/TestApp/include/TestCreateObjFromNativeRes.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestCreateObjFromNativeResD3D11.h b/Tests/TestApp/include/TestCreateObjFromNativeResD3D11.h index 925cf5c..cbdef45 100644 --- a/Tests/TestApp/include/TestCreateObjFromNativeResD3D11.h +++ b/Tests/TestApp/include/TestCreateObjFromNativeResD3D11.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestCreateObjFromNativeResD3D12.h b/Tests/TestApp/include/TestCreateObjFromNativeResD3D12.h index 4999656..608972d 100644 --- a/Tests/TestApp/include/TestCreateObjFromNativeResD3D12.h +++ b/Tests/TestApp/include/TestCreateObjFromNativeResD3D12.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestCreateObjFromNativeResGL.h b/Tests/TestApp/include/TestCreateObjFromNativeResGL.h index 3d1a0cd..ac18cd6 100644 --- a/Tests/TestApp/include/TestCreateObjFromNativeResGL.h +++ b/Tests/TestApp/include/TestCreateObjFromNativeResGL.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestDepthStencilState.h b/Tests/TestApp/include/TestDepthStencilState.h index ca28685..b0f7de3 100644 --- a/Tests/TestApp/include/TestDepthStencilState.h +++ b/Tests/TestApp/include/TestDepthStencilState.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestDrawCommands.h b/Tests/TestApp/include/TestDrawCommands.h index 00dce01..9507716 100644 --- a/Tests/TestApp/include/TestDrawCommands.h +++ b/Tests/TestApp/include/TestDrawCommands.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestGeometryShader.h b/Tests/TestApp/include/TestGeometryShader.h index 7f9577b..965c2db 100644 --- a/Tests/TestApp/include/TestGeometryShader.h +++ b/Tests/TestApp/include/TestGeometryShader.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestPSOCompatibility.h b/Tests/TestApp/include/TestPSOCompatibility.h index 89f3485..0c18cb1 100644 --- a/Tests/TestApp/include/TestPSOCompatibility.h +++ b/Tests/TestApp/include/TestPSOCompatibility.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestPipelineStateBase.h b/Tests/TestApp/include/TestPipelineStateBase.h index c66166f..e953b0b 100644 --- a/Tests/TestApp/include/TestPipelineStateBase.h +++ b/Tests/TestApp/include/TestPipelineStateBase.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestRasterizerState.h b/Tests/TestApp/include/TestRasterizerState.h index ad08a75..26e3e9d 100644 --- a/Tests/TestApp/include/TestRasterizerState.h +++ b/Tests/TestApp/include/TestRasterizerState.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestRenderTarget.h b/Tests/TestApp/include/TestRenderTarget.h index 0277c93..917183b 100644 --- a/Tests/TestApp/include/TestRenderTarget.h +++ b/Tests/TestApp/include/TestRenderTarget.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestSamplerCreation.h b/Tests/TestApp/include/TestSamplerCreation.h index e6b67b2..6ffe57d 100644 --- a/Tests/TestApp/include/TestSamplerCreation.h +++ b/Tests/TestApp/include/TestSamplerCreation.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestShaderResArrays.h b/Tests/TestApp/include/TestShaderResArrays.h index ae5a417..24bd818 100644 --- a/Tests/TestApp/include/TestShaderResArrays.h +++ b/Tests/TestApp/include/TestShaderResArrays.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestTessellation.h b/Tests/TestApp/include/TestTessellation.h index 48c1150..c3257ac 100644 --- a/Tests/TestApp/include/TestTessellation.h +++ b/Tests/TestApp/include/TestTessellation.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestTextureCreation.h b/Tests/TestApp/include/TestTextureCreation.h index a3b2907..2508b38 100644 --- a/Tests/TestApp/include/TestTextureCreation.h +++ b/Tests/TestApp/include/TestTextureCreation.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestTexturing.h b/Tests/TestApp/include/TestTexturing.h index ed55bac..6953c74 100644 --- a/Tests/TestApp/include/TestTexturing.h +++ b/Tests/TestApp/include/TestTexturing.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/TestVPAndSR.h b/Tests/TestApp/include/TestVPAndSR.h index 07893d5..79b10c8 100644 --- a/Tests/TestApp/include/TestVPAndSR.h +++ b/Tests/TestApp/include/TestVPAndSR.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/UnitTestBase.h b/Tests/TestApp/include/UnitTestBase.h index 38b3fd0..2d12362 100644 --- a/Tests/TestApp/include/UnitTestBase.h +++ b/Tests/TestApp/include/UnitTestBase.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/include/pch.h b/Tests/TestApp/include/pch.h index f10e317..6f4aff4 100644 --- a/Tests/TestApp/include/pch.h +++ b/Tests/TestApp/include/pch.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/AllocatorTest.cpp b/Tests/TestApp/src/AllocatorTest.cpp index 89ef347..9f5e42d 100644 --- a/Tests/TestApp/src/AllocatorTest.cpp +++ b/Tests/TestApp/src/AllocatorTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/MTResourceCreationTest.cpp b/Tests/TestApp/src/MTResourceCreationTest.cpp index d1160b5..0bf8529 100644 --- a/Tests/TestApp/src/MTResourceCreationTest.cpp +++ b/Tests/TestApp/src/MTResourceCreationTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/MathLibTest.cpp b/Tests/TestApp/src/MathLibTest.cpp index 572e338..d43de16 100644 --- a/Tests/TestApp/src/MathLibTest.cpp +++ b/Tests/TestApp/src/MathLibTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -519,6 +519,38 @@ public: 5, 6); std::hash<float2x2>()(m3); } + + // Test ortho projection matrix + { + { + float4x4 OrthoProj = Ortho(2.f, 4.f, -4.f, 12.f, true); + auto c0 = float3(-1.f, -2.f, -4.f) * OrthoProj; + auto c1 = float3(+1.f, +2.f, +12.f) * OrthoProj; + VERIFY_EXPR(c0 == float3(-1, -1, 0) && c1 == float3(+1,+1,+1) ); + } + + { + float4x4 OrthoProj = Ortho(2.f, 4.f, -4.f, 12.f, false); + auto c0 = float3(-1.f, -2.f, -4.f) * OrthoProj; + auto c1 = float3(+1.f, +2.f, +12.f) * OrthoProj; + VERIFY_EXPR(c0 == float3(-1, -1, -1) && c1 == float3(+1, +1, +1)); + } + + { + float4x4 OrthoProj = OrthoOffCenter(-2.f, 6.f, -4.f, +12.f, -6.f, 10.f, true); + auto c0 = float3(-2.f, -4.f, -6.f) * OrthoProj; + auto c1 = float3(+6.f, +12.f, +10.f) * OrthoProj; + VERIFY_EXPR(c0 == float3(-1, -1, 0) && c1 == float3(+1, +1, +1)); + } + + { + float4x4 OrthoProj = OrthoOffCenter(-2.f, 6.f, -4.f, +12.f, -6.f, 10.f, false); + auto c0 = float3(-2.f, -4.f, -6.f) * OrthoProj; + auto c1 = float3(+6.f, +12.f, +10.f) * OrthoProj; + VERIFY_EXPR(c0 == float3(-1, -1, -1) && c1 == float3(+1, +1, +1)); + } + } + SetStatus(TestResult::Succeeded); } }; diff --git a/Tests/TestApp/src/RenderScriptTest.cpp b/Tests/TestApp/src/RenderScriptTest.cpp index b4010d7..bf8b514 100644 --- a/Tests/TestApp/src/RenderScriptTest.cpp +++ b/Tests/TestApp/src/RenderScriptTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/RingBufferTest.cpp b/Tests/TestApp/src/RingBufferTest.cpp index c139c93..03aec5a 100644 --- a/Tests/TestApp/src/RingBufferTest.cpp +++ b/Tests/TestApp/src/RingBufferTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/ShaderConverterTest.cpp b/Tests/TestApp/src/ShaderConverterTest.cpp index 6e7b78f..837d911 100644 --- a/Tests/TestApp/src/ShaderConverterTest.cpp +++ b/Tests/TestApp/src/ShaderConverterTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/SmartPointerTest.cpp b/Tests/TestApp/src/SmartPointerTest.cpp index 5030433..27a73fb 100644 --- a/Tests/TestApp/src/SmartPointerTest.cpp +++ b/Tests/TestApp/src/SmartPointerTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp index 5147041..fddb947 100644 --- a/Tests/TestApp/src/TestApp.cpp +++ b/Tests/TestApp/src/TestApp.cpp @@ -23,6 +23,7 @@ #include <sstream> #include <math.h> +#include <iomanip> #include "PlatformDefinitions.h" #include "TestApp.h" @@ -62,6 +63,7 @@ #include "TestCopyTexData.h" #include "PlatformMisc.h" #include "TestBufferCreation.h" +#include "TestBrokenShader.h" using namespace Diligent; @@ -92,6 +94,8 @@ void TestApp::InitializeDiligentEngine( SCDesc.SamplesCount = 1; Uint32 NumDeferredCtx = 0; std::vector<IDeviceContext*> ppContexts; + std::vector<HardwareAdapterAttribs> Adapters; + std::vector<std::vector<DisplayModeAttribs>> AdapterDisplayModes; switch (m_DeviceType) { #if D3D11_SUPPORTED @@ -103,12 +107,27 @@ void TestApp::InitializeDiligentEngine( // Load the dll and import GetEngineFactoryD3D11() function LoadGraphicsEngineD3D11(GetEngineFactoryD3D11); #endif - ppContexts.resize(1 + NumDeferredCtx); auto *pFactoryD3D11 = GetEngineFactoryD3D11(); + Uint32 NumAdapters = 0; + pFactoryD3D11->EnumerateHardwareAdapters(NumAdapters, 0); + Adapters.resize(NumAdapters); + pFactoryD3D11->EnumerateHardwareAdapters(NumAdapters, Adapters.data()); + + for(Uint32 i=0; i < Adapters.size(); ++i) + { + Uint32 NumDisplayModes = 0; + std::vector<DisplayModeAttribs> DisplayModes; + pFactoryD3D11->EnumerateDisplayModes(i, 0, TEX_FORMAT_RGBA8_UNORM, NumDisplayModes, nullptr); + DisplayModes.resize(NumDisplayModes); + pFactoryD3D11->EnumerateDisplayModes(i, 0, TEX_FORMAT_RGBA8_UNORM, NumDisplayModes, DisplayModes.data()); + AdapterDisplayModes.emplace_back(std::move(DisplayModes)); + } + + ppContexts.resize(1 + NumDeferredCtx); pFactoryD3D11->CreateDeviceAndContextsD3D11(DeviceAttribs, &m_pDevice, ppContexts.data(), NumDeferredCtx); if(NativeWindowHandle != nullptr) - pFactoryD3D11->CreateSwapChainD3D11(m_pDevice, ppContexts[0], SCDesc, NativeWindowHandle, &m_pSwapChain); + pFactoryD3D11->CreateSwapChainD3D11(m_pDevice, ppContexts[0], SCDesc, FullScreenModeDesc{}, NativeWindowHandle, &m_pSwapChain); } break; #endif @@ -121,13 +140,29 @@ void TestApp::InitializeDiligentEngine( // Load the dll and import GetEngineFactoryD3D12() function LoadGraphicsEngineD3D12(GetEngineFactoryD3D12); #endif + auto *pFactoryD3D12 = GetEngineFactoryD3D12(); + Uint32 NumAdapters = 0; + pFactoryD3D12->EnumerateHardwareAdapters(NumAdapters, 0); + Adapters.resize(NumAdapters); + pFactoryD3D12->EnumerateHardwareAdapters(NumAdapters, Adapters.data()); + + for (Uint32 i = 0; i < Adapters.size(); ++i) + { + Uint32 NumDisplayModes = 0; + std::vector<DisplayModeAttribs> DisplayModes; + pFactoryD3D12->EnumerateDisplayModes(i, 0, TEX_FORMAT_RGBA8_UNORM, NumDisplayModes, nullptr); + DisplayModes.resize(NumDisplayModes); + pFactoryD3D12->EnumerateDisplayModes(i, 0, TEX_FORMAT_RGBA8_UNORM, NumDisplayModes, DisplayModes.data()); + AdapterDisplayModes.emplace_back(std::move(DisplayModes)); + } + EngineD3D12Attribs EngD3D12Attribs; ppContexts.resize(1 + NumDeferredCtx); - auto *pFactoryD3D12 = GetEngineFactoryD3D12(); + pFactoryD3D12->CreateDeviceAndContextsD3D12(EngD3D12Attribs, &m_pDevice, ppContexts.data(), NumDeferredCtx); if (!m_pSwapChain && NativeWindowHandle != nullptr) - pFactoryD3D12->CreateSwapChainD3D12(m_pDevice, ppContexts[0], SCDesc, NativeWindowHandle, &m_pSwapChain); + pFactoryD3D12->CreateSwapChainD3D12(m_pDevice, ppContexts[0], SCDesc, FullScreenModeDesc{}, NativeWindowHandle, &m_pSwapChain); } break; #endif @@ -186,6 +221,23 @@ void TestApp::InitializeDiligentEngine( break; } + + std::stringstream ss; + ss << "Found " << Adapters.size() << " adapters:\n"; + for (Uint32 i = 0; i < Adapters.size(); ++i) + { + ss << Adapters[i].Description << " (" << (Adapters[i].DedicatedVideoMemory >> 20) << " MB). Num outputs: " << Adapters[i].NumOutputs << ". Display modes:\n"; + const auto &DisplayModes = AdapterDisplayModes[i]; + for(Uint32 m=0; m < DisplayModes.size(); ++m) + { + const auto &Mode = DisplayModes[m]; + float RefreshRate = (float)Mode.RefreshRateNumerator / (float)Mode.RefreshRateDenominator; + ss << " " << Mode.Width << 'x' << Mode.Height << " " << std::fixed << std::setprecision(2) << RefreshRate << " Hz\n"; + } + } + auto str = ss.str(); + LOG_INFO_MESSAGE(str); + m_pImmediateContext.Attach(ppContexts[0]); m_pDeferredContexts.resize(NumDeferredCtx); for (Diligent::Uint32 ctx = 0; ctx < NumDeferredCtx; ++ctx) @@ -202,6 +254,7 @@ void TestApp::InitializeRenderers() TestTextureCreation TestTexCreation(m_pDevice, m_pImmediateContext); TestBufferCreation TestBuffCreation(m_pDevice, m_pImmediateContext); TestPSOCompatibility TestPSOCompat(m_pDevice); + TestBrokenShader TestBrknShdr(m_pDevice); m_TestGS.Init(m_pDevice, m_pImmediateContext); m_TestTessellation.Init(m_pDevice, m_pImmediateContext); @@ -517,5 +570,5 @@ void TestApp::Render() void TestApp::Present() { - m_pSwapChain->Present(); + m_pSwapChain->Present(0); } diff --git a/Tests/TestApp/src/TestBlendState.cpp b/Tests/TestApp/src/TestBlendState.cpp index d399372..f54df7e 100644 --- a/Tests/TestApp/src/TestBlendState.cpp +++ b/Tests/TestApp/src/TestBlendState.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestBrokenShader.cpp b/Tests/TestApp/src/TestBrokenShader.cpp new file mode 100644 index 0000000..7282828 --- /dev/null +++ b/Tests/TestApp/src/TestBrokenShader.cpp @@ -0,0 +1,61 @@ +/* Copyright 2015-2018 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. + */ + +// EngineSandbox.cpp : Defines the entry point for the application. +// + +#include "pch.h" +#include "TestBrokenShader.h" + +using namespace Diligent; + +static const char g_BrokenShaderSource[] = +R"( +void VSMain(out float4 pos : SV_POSITION) +{ + pos = float3(0.0, 0.0, 0.0, 0.0); +} +)"; + +TestBrokenShader::TestBrokenShader(IRenderDevice *pDevice) : + UnitTestBase("Broken shader test") +{ + ShaderCreationAttribs Attrs; + Attrs.Source = g_BrokenShaderSource; + Attrs.EntryPoint = "VSMain"; + Attrs.Desc.ShaderType = SHADER_TYPE_VERTEX; + Attrs.Desc.Name = "Broken shader test"; + Attrs.SourceLanguage = SHADER_SOURCE_LANGUAGE_HLSL; + RefCntAutoPtr<IShader> pBrokenShader; + IDataBlob *pErrors = nullptr; + Attrs.ppCompilerOutput = &pErrors; + LOG_INFO_MESSAGE("No worries, testing broken shader..."); + pDevice->CreateShader(Attrs, &pBrokenShader); + VERIFY_EXPR(!pBrokenShader); + VERIFY_EXPR(pErrors != nullptr); + const char* Msg = reinterpret_cast<const char*>(pErrors->GetDataPtr()); + LOG_INFO_MESSAGE("Compiler output:\n", Msg); + pErrors->Release(); + + SetStatus(TestResult::Succeeded); +} diff --git a/Tests/TestApp/src/TestBufferAccess.cpp b/Tests/TestApp/src/TestBufferAccess.cpp index e74d592..29cbd19 100644 --- a/Tests/TestApp/src/TestBufferAccess.cpp +++ b/Tests/TestApp/src/TestBufferAccess.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestBufferCreation.cpp b/Tests/TestApp/src/TestBufferCreation.cpp index f0f5b3d..9794193 100644 --- a/Tests/TestApp/src/TestBufferCreation.cpp +++ b/Tests/TestApp/src/TestBufferCreation.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestComputeShaders.cpp b/Tests/TestApp/src/TestComputeShaders.cpp index 658f26b..9b3f392 100644 --- a/Tests/TestApp/src/TestComputeShaders.cpp +++ b/Tests/TestApp/src/TestComputeShaders.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestCopyTexData.cpp b/Tests/TestApp/src/TestCopyTexData.cpp index 5bb65e1..d34f10e 100644 --- a/Tests/TestApp/src/TestCopyTexData.cpp +++ b/Tests/TestApp/src/TestCopyTexData.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp b/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp index be8cfab..cd985a1 100644 --- a/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp +++ b/Tests/TestApp/src/TestCreateObjFromNativeResD3D11.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestCreateObjFromNativeResD3D12.cpp b/Tests/TestApp/src/TestCreateObjFromNativeResD3D12.cpp index b402f7f..a98cfbe 100644 --- a/Tests/TestApp/src/TestCreateObjFromNativeResD3D12.cpp +++ b/Tests/TestApp/src/TestCreateObjFromNativeResD3D12.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestCreateObjFromNativeResGL.cpp b/Tests/TestApp/src/TestCreateObjFromNativeResGL.cpp index 0a61d22..59535c7 100644 --- a/Tests/TestApp/src/TestCreateObjFromNativeResGL.cpp +++ b/Tests/TestApp/src/TestCreateObjFromNativeResGL.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestDepthStencilState.cpp b/Tests/TestApp/src/TestDepthStencilState.cpp index 94c6198..8ad006b 100644 --- a/Tests/TestApp/src/TestDepthStencilState.cpp +++ b/Tests/TestApp/src/TestDepthStencilState.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestDrawCommands.cpp b/Tests/TestApp/src/TestDrawCommands.cpp index f8e341d..d9dcb64 100644 --- a/Tests/TestApp/src/TestDrawCommands.cpp +++ b/Tests/TestApp/src/TestDrawCommands.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestGeometryShader.cpp b/Tests/TestApp/src/TestGeometryShader.cpp index 0352a8e..922ba8a 100644 --- a/Tests/TestApp/src/TestGeometryShader.cpp +++ b/Tests/TestApp/src/TestGeometryShader.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestPSOCompatibility.cpp b/Tests/TestApp/src/TestPSOCompatibility.cpp index 4d51586..f14f22d 100644 --- a/Tests/TestApp/src/TestPSOCompatibility.cpp +++ b/Tests/TestApp/src/TestPSOCompatibility.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestPipelineStateBase.cpp b/Tests/TestApp/src/TestPipelineStateBase.cpp index b4c5041..a1222c5 100644 --- a/Tests/TestApp/src/TestPipelineStateBase.cpp +++ b/Tests/TestApp/src/TestPipelineStateBase.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestRasterizerState.cpp b/Tests/TestApp/src/TestRasterizerState.cpp index 64a1b41..8033f6a 100644 --- a/Tests/TestApp/src/TestRasterizerState.cpp +++ b/Tests/TestApp/src/TestRasterizerState.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestRenderTarget.cpp b/Tests/TestApp/src/TestRenderTarget.cpp index e09acb1..0cbaf2c 100644 --- a/Tests/TestApp/src/TestRenderTarget.cpp +++ b/Tests/TestApp/src/TestRenderTarget.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestSamplerCreation.cpp b/Tests/TestApp/src/TestSamplerCreation.cpp index e46f7cd..bc7616d 100644 --- a/Tests/TestApp/src/TestSamplerCreation.cpp +++ b/Tests/TestApp/src/TestSamplerCreation.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestShaderResArrays.cpp b/Tests/TestApp/src/TestShaderResArrays.cpp index dc65b9a..11ae64b 100644 --- a/Tests/TestApp/src/TestShaderResArrays.cpp +++ b/Tests/TestApp/src/TestShaderResArrays.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestTessellation.cpp b/Tests/TestApp/src/TestTessellation.cpp index e48bff8..3973c8b 100644 --- a/Tests/TestApp/src/TestTessellation.cpp +++ b/Tests/TestApp/src/TestTessellation.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestTextureCreation.cpp b/Tests/TestApp/src/TestTextureCreation.cpp index acaccaa..ae938fd 100644 --- a/Tests/TestApp/src/TestTextureCreation.cpp +++ b/Tests/TestApp/src/TestTextureCreation.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestTexturing.cpp b/Tests/TestApp/src/TestTexturing.cpp index ef032d0..c79676a 100644 --- a/Tests/TestApp/src/TestTexturing.cpp +++ b/Tests/TestApp/src/TestTexturing.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/TestVPAndSR.cpp b/Tests/TestApp/src/TestVPAndSR.cpp index c3b8b74..4c6b3e0 100644 --- a/Tests/TestApp/src/TestVPAndSR.cpp +++ b/Tests/TestApp/src/TestVPAndSR.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/UWP/TestAppUWP.cpp b/Tests/TestApp/src/UWP/TestAppUWP.cpp index a74a8de..d7158f8 100644 --- a/Tests/TestApp/src/UWP/TestAppUWP.cpp +++ b/Tests/TestApp/src/UWP/TestAppUWP.cpp @@ -165,11 +165,11 @@ public: IDXGISwapChain3 *pDXGISwapChain3 = nullptr; if (m_DeviceType == DeviceType::D3D12) { - GetEngineFactoryD3D12()->CreateSwapChainD3D12(m_pDevice, m_pImmediateContext, SCDesc, reinterpret_cast<IUnknown*>(window), &m_pSwapChain); + GetEngineFactoryD3D12()->CreateSwapChainD3D12(m_pDevice, m_pImmediateContext, SCDesc, FullScreenModeDesc{}, reinterpret_cast<IUnknown*>(window), &m_pSwapChain); } else if (m_DeviceType == DeviceType::D3D11) { - GetEngineFactoryD3D11()->CreateSwapChainD3D11(m_pDevice, m_pImmediateContext, SCDesc, reinterpret_cast<IUnknown*>(window), &m_pSwapChain); + GetEngineFactoryD3D11()->CreateSwapChainD3D11(m_pDevice, m_pImmediateContext, SCDesc, FullScreenModeDesc{}, reinterpret_cast<IUnknown*>(window), &m_pSwapChain); } else UNEXPECTED("Unexpected device type"); diff --git a/Tests/TestApp/src/UnitTestBase.cpp b/Tests/TestApp/src/UnitTestBase.cpp index fefaac2..86ed04d 100644 --- a/Tests/TestApp/src/UnitTestBase.cpp +++ b/Tests/TestApp/src/UnitTestBase.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp b/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp index 1463bed..97ee76b 100644 --- a/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp +++ b/Tests/TestApp/src/VarSizeAllocationsManagerTest.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/Tests/TestApp/src/pch.cpp b/Tests/TestApp/src/pch.cpp index b61be60..5df156a 100644 --- a/Tests/TestApp/src/pch.cpp +++ b/Tests/TestApp/src/pch.cpp @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 Egor Yusov +/* Copyright 2015-2018 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/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp index e196585..c3f0f1c 100644 --- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp +++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp @@ -39,7 +39,7 @@ public: virtual ID3D11DepthStencilView *GetDSV()override final { return m_pDSV; } - virtual void Present()override final + virtual void Present(Uint32 SyncInterval)override final { UNEXPECTED("Present is not expected to be called directly"); } @@ -62,6 +62,16 @@ public: m_pDSV = nullptr; } + virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final + { + UNEXPECTED("Fullscreen mode cannot be set through the proxy swap chain"); + } + + virtual void SetWindowedMode()override final + { + UNEXPECTED("Windowed mode cannot be set through the proxy swap chain"); + } + private: ID3D11RenderTargetView *m_pRTV = nullptr; ID3D11DepthStencilView *m_pDSV = nullptr; diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp index 11b912e..938d5b1 100644 --- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp +++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp @@ -103,11 +103,21 @@ public: return m_DSV; } - virtual void Present()override final + virtual void Present(Uint32 SyncInterval)override final { UNEXPECTED("Present is not expected to be called directly"); } + virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final + { + UNEXPECTED("Fullscreen mode cannot be set through the proxy swap chain"); + } + + virtual void SetWindowedMode()override final + { + UNEXPECTED("Windowed mode cannot be set through the proxy swap chain"); + } + virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final { TBase::Resize(NewWidth, NewHeight, 0); diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp index 1d7ac11..8be2797 100644 --- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp +++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp @@ -29,11 +29,21 @@ public: m_UnityGraphicsGL(UnityGraphicsGL) {} - virtual void Present()override final + virtual void Present(Uint32 SyncInterval)override final { UNEXPECTED("Present is not expected to be called directly"); } + virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final + { + UNEXPECTED("Fullscreen mode cannot be set through the proxy swap chain"); + } + + virtual void SetWindowedMode()override final + { + UNEXPECTED("Windowed mode cannot be set through the proxy swap chain"); + } + virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final { TBase::Resize(NewWidth, NewHeight, 0); |