From 51de05346f0cb202f6ba80d5e9dfa996a97bae4e Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Wed, 4 Dec 2019 20:47:45 -0800 Subject: Updated core & tools. Fixed https://github.com/DiligentGraphics/DiligentEngine/issues/67, fixed https://github.com/DiligentGraphics/DiligentEngine/issues/49 --- Tests/TestApp/include/AllocatorTest.h | 32 ----------- Tests/TestApp/include/SmartPointerTest.h | 96 -------------------------------- Tests/TestApp/include/TestApp.h | 2 - 3 files changed, 130 deletions(-) delete mode 100644 Tests/TestApp/include/AllocatorTest.h delete mode 100644 Tests/TestApp/include/SmartPointerTest.h (limited to 'Tests/TestApp/include') diff --git a/Tests/TestApp/include/AllocatorTest.h b/Tests/TestApp/include/AllocatorTest.h deleted file mode 100644 index b9dea57..0000000 --- a/Tests/TestApp/include/AllocatorTest.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 AllocatorTest : public UnitTestBase -{ -public: - AllocatorTest(); -}; diff --git a/Tests/TestApp/include/SmartPointerTest.h b/Tests/TestApp/include/SmartPointerTest.h deleted file mode 100644 index 815dee9..0000000 --- a/Tests/TestApp/include/SmartPointerTest.h +++ /dev/null @@ -1,96 +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 "RenderDevice.h" -#include "RefCntAutoPtr.h" -#include "RefCountedObjectImpl.h" -#include -#include -#include - -#include "UnitTestBase.h" - -class SmartPointerTest : public UnitTestBase -{ -public: - class Object : public Diligent::RefCountedObject - { - public: - virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, Diligent::IObject **ppInterface ) - { - *ppInterface = nullptr; - if(IID==Diligent::IID_Unknown) - { - *ppInterface = this; - (*ppInterface)->AddRef(); - } - } - - Object( Diligent::IReferenceCounters *pRefCounters) : - RefCountedObject(pRefCounters), - m_Value(0) - { - } - - ~Object(){} - int m_Value; - }; - - class DerivedObject : public Object - { - public: - DerivedObject(Diligent::IReferenceCounters *pRefCounters) : - Object(pRefCounters), - m_Value2(1) - {} - int m_Value2; - }; - - typedef Diligent::RefCntAutoPtr SmartPtr; - typedef Diligent::RefCntWeakPtr WeakPtr; - - void CreateObject(Object **ppObj); - SmartPointerTest(); - ~SmartPointerTest(); - - std::vector m_Threads; - static void WorkerThreadFunc(SmartPointerTest *This, size_t ThreadNum); - Object *m_pSharedObject = nullptr; - void StartConcurrencyTest(); - void RunConcurrencyTest(); - void WaitForThreadStart(int VarId); - void StartThreadsAndWait(int VarId, size_t NumThreads); - std::atomic m_NumThreadsCompleted; - bool m_bStopThreads = false; - int m_NumTestsPerformed = 0; -#ifdef _DEBUG - static const int NumThreadInterations = 5; -#else - static const int NumThreadInterations = 10; -#endif - std::mutex m_Mtx; - std::condition_variable m_CondVar; - bool m_bThreadStart[2] = {false, false}; -}; diff --git a/Tests/TestApp/include/TestApp.h b/Tests/TestApp/include/TestApp.h index 96e7264..6380f65 100644 --- a/Tests/TestApp/include/TestApp.h +++ b/Tests/TestApp/include/TestApp.h @@ -42,7 +42,6 @@ #include "TestRenderTarget.h" #include "MTResourceCreationTest.h" #include "TestShaderResArrays.h" -#include "SmartPointerTest.h" #include "TestGeometryShader.h" #include "TestTessellation.h" @@ -93,7 +92,6 @@ protected: RefCntAutoPtr m_pFence; Uint64 m_NextFenceValue = 1; - SmartPointerTest m_SmartPointerTest; double m_CurrTime = 0; }; -- cgit v1.2.3