From e33d94fecd272db4bf542541c069e9e2c168c1d5 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 15 Feb 2019 22:48:41 -0800 Subject: Moved NativeApp to Diligent namespace --- Tests/TestApp/include/TestApp.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'Tests/TestApp/include') diff --git a/Tests/TestApp/include/TestApp.h b/Tests/TestApp/include/TestApp.h index 25ba0d3..1bd626d 100644 --- a/Tests/TestApp/include/TestApp.h +++ b/Tests/TestApp/include/TestApp.h @@ -46,6 +46,9 @@ #include "TestGeometryShader.h" #include "TestTessellation.h" +namespace Diligent +{ + class TestApp : public NativeAppBase { public: @@ -67,11 +70,11 @@ protected: ); void InitializeRenderers(); - Diligent::DeviceType m_DeviceType = Diligent::DeviceType::Undefined; - Diligent::RefCntAutoPtr m_pDevice; - Diligent::RefCntAutoPtr m_pImmediateContext; - std::vector > m_pDeferredContexts; - Diligent::RefCntAutoPtr m_pSwapChain; + DeviceType m_DeviceType = DeviceType::Undefined; + RefCntAutoPtr m_pDevice; + RefCntAutoPtr m_pImmediateContext; + std::vector > m_pDeferredContexts; + RefCntAutoPtr m_pSwapChain; std::string m_AppTitle; std::unique_ptr m_pTestDrawCommands; @@ -84,12 +87,14 @@ protected: TestGeometryShader m_TestGS; TestTessellation m_TestTessellation; - Diligent::RefCntAutoPtr m_pInstBuff, m_pInstBuff2, m_pUniformBuff, m_pUniformBuff2, m_pUniformBuff3, m_pUniformBuff4; - Diligent::RefCntAutoPtr m_pTestTex; - Diligent::RefCntAutoPtr m_pRenderScript; - Diligent::RefCntAutoPtr m_pFence; - Diligent::Uint64 m_NextFenceValue = 1; + RefCntAutoPtr m_pInstBuff, m_pInstBuff2, m_pUniformBuff, m_pUniformBuff2, m_pUniformBuff3, m_pUniformBuff4; + RefCntAutoPtr m_pTestTex; + RefCntAutoPtr m_pRenderScript; + RefCntAutoPtr m_pFence; + Uint64 m_NextFenceValue = 1; SmartPointerTest m_SmartPointerTest; double m_CurrTime = 0; }; + +} -- cgit v1.2.3