Removed VulkanResourceBase

5 files changed, 2 insertions, 92 deletions

diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
index 259fc8bd..b4a317df 100644
--- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt
+++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INCLUDE
     include/CommandContext.h
     include/CommandListVkImpl.h
     include/CommandQueueVkImpl.h
-    include/VulkanResourceBase.h
     include/VulkanTypeConversions.h
     include/DescriptorPoolManager.h
     include/DeviceContextVkImpl.h
@@ -65,7 +64,6 @@ set(SRC
     src/BufferViewVkImpl.cpp
     src/CommandContext.cpp
     src/CommandQueueVkImpl.cpp
-    src/VulkanResourceBase.cpp
     src/VulkanTypeConversions.cpp
     src/DescriptorPoolManager.cpp
     src/DeviceContextVkImpl.cpp
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h
index ba14efaf..b022d3b9 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.h
@@ -30,7 +30,6 @@
 #include "RenderDeviceVk.h"
 #include "BufferBase.h"
 #include "BufferViewVkImpl.h"
-#include "VulkanResourceBase.h"
 #include "DynamicUploadHeap.h"
 #include "VulkanUtilities/VulkanObjectWrappers.h"
 
@@ -40,7 +39,7 @@ namespace Diligent
 class FixedBlockMemoryAllocator;
 
 /// Implementation of the Diligent::IBufferVk interface
-class BufferVkImpl : public BufferBase<IBufferVk, BufferViewVkImpl, FixedBlockMemoryAllocator>, public VulkanResourceBase
+class BufferVkImpl : public BufferBase<IBufferVk, BufferViewVkImpl, FixedBlockMemoryAllocator>
 {
 public:
     typedef BufferBase<IBufferVk, BufferViewVkImpl, FixedBlockMemoryAllocator> TBufferBase;
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
index 7efce04b..d08f7084 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.h
@@ -30,8 +30,6 @@
 #include "RenderDeviceVk.h"
 #include "TextureBase.h"
 #include "TextureViewVkImpl.h"
-#include "VulkanResourceBase.h"
-
 
 namespace Diligent
 {
@@ -39,7 +37,7 @@ namespace Diligent
 class FixedBlockMemoryAllocator;
 
 /// Base implementation of the Diligent::ITextureVk interface
-class TextureVkImpl : public TextureBase<ITextureVk, TextureViewVkImpl, FixedBlockMemoryAllocator>, public VulkanResourceBase
+class TextureVkImpl : public TextureBase<ITextureVk, TextureViewVkImpl, FixedBlockMemoryAllocator>
 {
 public:
     typedef TextureBase<ITextureVk, TextureViewVkImpl, FixedBlockMemoryAllocator> TTextureBase;
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanResourceBase.h b/Graphics/GraphicsEngineVulkan/include/VulkanResourceBase.h
deleted file mode 100644
index 82043463..00000000
--- a/Graphics/GraphicsEngineVulkan/include/VulkanResourceBase.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*     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
-
-/// \file
-/// Implementation of the Diligent::D3D12ResourceBase class
-
-namespace Diligent
-{
-
-/// Base implementation of a D3D12 resource
-class VulkanResourceBase
-{
-public:
-#if 0
-    VulkanResourceBase() :
-        m_UsageState(D3D12_RESOURCE_STATE_COMMON)/*,
-        m_TransitioningState((D3D12_RESOURCE_STATES)-1)*/
-    {}
-
-    D3D12_RESOURCE_STATES GetState()const{return m_UsageState;}
-    void SetState(D3D12_RESOURCE_STATES UsageState){m_UsageState = UsageState;}
-    bool CheckAllStates(D3D12_RESOURCE_STATES States)const{return (m_UsageState & States) == States;}
-    bool CheckAnyState(D3D12_RESOURCE_STATES States)const{return (m_UsageState & States) != 0;}
-    ID3D12Resource *GetD3D12Resource(){ return m_pd3d12Resource; }
-
-protected:
-	D3D12_RESOURCE_STATES m_UsageState;
-	//D3D12_RESOURCE_STATES m_TransitioningState;
-    CComPtr<ID3D12Resource> m_pd3d12Resource; ///< D3D12 buffer object
-#endif
-};
-
-}
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanResourceBase.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanResourceBase.cpp
deleted file mode 100644
index 67cf4f1f..00000000
--- a/Graphics/GraphicsEngineVulkan/src/VulkanResourceBase.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*     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 "pch.h"
-#include "VulkanResourceBase.h"
-
-namespace Diligent
-{
-
-}