summaryrefslogtreecommitdiffstats
path: root/Tests/TestApp/include
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-02-16 06:48:41 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-02-16 06:48:41 +0000
commite33d94fecd272db4bf542541c069e9e2c168c1d5 (patch)
treec4c33fe97b817ed67fc505059a6323336660311f /Tests/TestApp/include
parentUpdated samples (fixed linux/max build error) (diff)
downloadDiligentEngine-e33d94fecd272db4bf542541c069e9e2c168c1d5.tar.gz
DiligentEngine-e33d94fecd272db4bf542541c069e9e2c168c1d5.zip
Moved NativeApp to Diligent namespace
Diffstat (limited to 'Tests/TestApp/include')
-rw-r--r--Tests/TestApp/include/TestApp.h25
1 files changed, 15 insertions, 10 deletions
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<Diligent::IRenderDevice> m_pDevice;
- Diligent::RefCntAutoPtr<Diligent::IDeviceContext> m_pImmediateContext;
- std::vector<Diligent::RefCntAutoPtr<Diligent::IDeviceContext> > m_pDeferredContexts;
- Diligent::RefCntAutoPtr<Diligent::ISwapChain> m_pSwapChain;
+ DeviceType m_DeviceType = DeviceType::Undefined;
+ RefCntAutoPtr<IRenderDevice> m_pDevice;
+ RefCntAutoPtr<IDeviceContext> m_pImmediateContext;
+ std::vector<RefCntAutoPtr<IDeviceContext> > m_pDeferredContexts;
+ RefCntAutoPtr<ISwapChain> m_pSwapChain;
std::string m_AppTitle;
std::unique_ptr<TestDrawCommands> m_pTestDrawCommands;
@@ -84,12 +87,14 @@ protected:
TestGeometryShader m_TestGS;
TestTessellation m_TestTessellation;
- Diligent::RefCntAutoPtr<Diligent::IBuffer> m_pInstBuff, m_pInstBuff2, m_pUniformBuff, m_pUniformBuff2, m_pUniformBuff3, m_pUniformBuff4;
- Diligent::RefCntAutoPtr<Diligent::ITexture> m_pTestTex;
- Diligent::RefCntAutoPtr<Diligent::ScriptParser> m_pRenderScript;
- Diligent::RefCntAutoPtr<Diligent::IFence> m_pFence;
- Diligent::Uint64 m_NextFenceValue = 1;
+ RefCntAutoPtr<IBuffer> m_pInstBuff, m_pInstBuff2, m_pUniformBuff, m_pUniformBuff2, m_pUniformBuff3, m_pUniformBuff4;
+ RefCntAutoPtr<ITexture> m_pTestTex;
+ RefCntAutoPtr<ScriptParser> m_pRenderScript;
+ RefCntAutoPtr<IFence> m_pFence;
+ Uint64 m_NextFenceValue = 1;
SmartPointerTest m_SmartPointerTest;
double m_CurrTime = 0;
};
+
+}