summaryrefslogtreecommitdiffstats
path: root/Tests/TestApp/include
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-13 01:48:34 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-13 01:48:34 +0000
commit8df96e2df8decdd134beae14bf2cec68b6dd5230 (patch)
treecc03d887198f94be22beebecc08efc152f282245 /Tests/TestApp/include
parentUpdated submodules (added unit tests). Reworked TestApp (diff)
downloadDiligentEngine-8df96e2df8decdd134beae14bf2cec68b6dd5230.tar.gz
DiligentEngine-8df96e2df8decdd134beae14bf2cec68b6dd5230.zip
Removed RenderScript & Lua; updated submodules
Diffstat (limited to 'Tests/TestApp/include')
-rw-r--r--Tests/TestApp/include/RenderScriptTest.h32
-rw-r--r--Tests/TestApp/include/TestApp.h4
-rw-r--r--Tests/TestApp/include/TestComputeShaders.h2
-rw-r--r--Tests/TestApp/include/TestRenderTarget.h2
-rw-r--r--Tests/TestApp/include/TestVPAndSR.h2
5 files changed, 1 insertions, 41 deletions
diff --git a/Tests/TestApp/include/RenderScriptTest.h b/Tests/TestApp/include/RenderScriptTest.h
deleted file mode 100644
index af7162f..0000000
--- a/Tests/TestApp/include/RenderScriptTest.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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 RenderScriptTest : public UnitTestBase
-{
-public:
- RenderScriptTest( Diligent::IRenderDevice *pRenderDevice, Diligent::IDeviceContext *pContext );
-};
diff --git a/Tests/TestApp/include/TestApp.h b/Tests/TestApp/include/TestApp.h
index 5d1cb59..b866b40 100644
--- a/Tests/TestApp/include/TestApp.h
+++ b/Tests/TestApp/include/TestApp.h
@@ -34,7 +34,6 @@
#include "TestDrawCommands.h"
#include "TestBufferAccess.h"
#include "TestTexturing.h"
-#include "ScriptParser.h"
#include "TestComputeShaders.h"
#include "Timer.h"
#include "TestRenderTarget.h"
@@ -80,9 +79,8 @@ protected:
TestGeometryShader m_TestGS;
TestTessellation m_TestTessellation;
- RefCntAutoPtr<IBuffer> m_pInstBuff, m_pInstBuff2, m_pUniformBuff, m_pUniformBuff2, m_pUniformBuff3, m_pUniformBuff4;
+ RefCntAutoPtr<IBuffer> m_pUniformBuff2, m_pUniformBuff3, m_pUniformBuff4;
RefCntAutoPtr<ITexture> m_pTestTex;
- RefCntAutoPtr<ScriptParser> m_pRenderScript;
RefCntAutoPtr<IFence> m_pFence;
Uint64 m_NextFenceValue = 1;
diff --git a/Tests/TestApp/include/TestComputeShaders.h b/Tests/TestApp/include/TestComputeShaders.h
index 939e80a..756cf55 100644
--- a/Tests/TestApp/include/TestComputeShaders.h
+++ b/Tests/TestApp/include/TestComputeShaders.h
@@ -23,7 +23,6 @@
#pragma once
-#include "ScriptParser.h"
#include "UnitTestBase.h"
class TestComputeShaders : public UnitTestBase
@@ -37,5 +36,4 @@ public:
private:
Diligent::RefCntAutoPtr<Diligent::IRenderDevice> m_pRenderDevice;
Diligent::RefCntAutoPtr<Diligent::IDeviceContext> m_pDeviceContext;
- Diligent::RefCntAutoPtr<Diligent::ScriptParser> m_pRenderScript;
};
diff --git a/Tests/TestApp/include/TestRenderTarget.h b/Tests/TestApp/include/TestRenderTarget.h
index 2122804..0468f00 100644
--- a/Tests/TestApp/include/TestRenderTarget.h
+++ b/Tests/TestApp/include/TestRenderTarget.h
@@ -23,7 +23,6 @@
#pragma once
-#include "ScriptParser.h"
#include "UnitTestBase.h"
class TestRenderTarget : public UnitTestBase
@@ -38,5 +37,4 @@ private:
Diligent::RefCntAutoPtr<Diligent::IRenderDevice> m_pRenderDevice;
Diligent::RefCntAutoPtr<Diligent::IDeviceContext> m_pDeviceContext;
- Diligent::RefCntAutoPtr<Diligent::ScriptParser> m_pRenderScript;
};
diff --git a/Tests/TestApp/include/TestVPAndSR.h b/Tests/TestApp/include/TestVPAndSR.h
index f3ff206..36f038f 100644
--- a/Tests/TestApp/include/TestVPAndSR.h
+++ b/Tests/TestApp/include/TestVPAndSR.h
@@ -24,7 +24,6 @@
#pragma once
#include "UnitTestBase.h"
-#include "ScriptParser.h"
class TestVPAndSR : public UnitTestBase
{
@@ -34,5 +33,4 @@ public:
private:
Diligent::RefCntAutoPtr<Diligent::IRenderDevice> m_pRenderDevice;
Diligent::RefCntAutoPtr<Diligent::IDeviceContext> m_pDeviceContext;
- Diligent::RefCntAutoPtr<Diligent::ScriptParser> m_pRenderScript;
};