summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineVulkan
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-04-15 20:34:03 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-04-15 20:34:03 +0000
commit31bbef5ae4623aa4d3588d979e799de52050a04c (patch)
tree230edcbd910324c683593e6c0ab0c2c93aa06513 /Graphics/GraphicsEngineVulkan
parentImplemented vulkan sampler creation (diff)
downloadDiligentCore-31bbef5ae4623aa4d3588d979e799de52050a04c.tar.gz
DiligentCore-31bbef5ae4623aa4d3588d979e799de52050a04c.zip
Removed VulkanUtils.cpp/h
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
-rw-r--r--Graphics/GraphicsEngineVulkan/CMakeLists.txt2
-rw-r--r--Graphics/GraphicsEngineVulkan/include/VulkanUtils.h30
-rw-r--r--Graphics/GraphicsEngineVulkan/src/DescriptorHeap.cpp1
-rw-r--r--Graphics/GraphicsEngineVulkan/src/VulkanUtils.cpp47
4 files changed, 0 insertions, 80 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
index 5d417d8a..63a4d1ec 100644
--- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt
+++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INCLUDE
include/CommandQueueVkImpl.h
include/VulkanResourceBase.h
include/VulkanTypeConversions.h
- include/VulkanUtils.h
include/DescriptorHeap.h
include/DeviceContextVkImpl.h
include/DynamicUploadHeap.h
@@ -66,7 +65,6 @@ set(SRC
src/CommandQueueVkImpl.cpp
src/VulkanResourceBase.cpp
src/VulkanTypeConversions.cpp
- src/VulkanUtils.cpp
src/DescriptorHeap.cpp
src/DeviceContextVkImpl.cpp
src/DynamicUploadHeap.cpp
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtils.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtils.h
deleted file mode 100644
index e7d509be..00000000
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtils.h
+++ /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.
- */
-
-#pragma once
-
-#include "BasicTypes.h"
-namespace Diligent
-{
- //const Char* GetD3D12DescriptorHeapTypeLiteralName(D3D12_DESCRIPTOR_HEAP_TYPE Type);
-}
diff --git a/Graphics/GraphicsEngineVulkan/src/DescriptorHeap.cpp b/Graphics/GraphicsEngineVulkan/src/DescriptorHeap.cpp
index a464d7b9..6967f33f 100644
--- a/Graphics/GraphicsEngineVulkan/src/DescriptorHeap.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/DescriptorHeap.cpp
@@ -24,7 +24,6 @@
#include "pch.h"
#include "DescriptorHeap.h"
#include "RenderDeviceVkImpl.h"
-#include "VulkanUtils.h"
namespace Diligent
{
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtils.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtils.cpp
deleted file mode 100644
index 562cbe81..00000000
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtils.cpp
+++ /dev/null
@@ -1,47 +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 "VulkanUtils.h"
-
-namespace Diligent
-{
-#if 0
- const Char* GetD3D12DescriptorHeapTypeLiteralName(D3D12_DESCRIPTOR_HEAP_TYPE Type)
- {
- static bool bIsInitialized = false;
- static const Char* HeapTypeNames[D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES];
- if (!bIsInitialized)
- {
- HeapTypeNames[D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV] = "D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV";
- HeapTypeNames[D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER] = "D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER";
- HeapTypeNames[D3D12_DESCRIPTOR_HEAP_TYPE_RTV] = "D3D12_DESCRIPTOR_HEAP_TYPE_RTV";
- HeapTypeNames[D3D12_DESCRIPTOR_HEAP_TYPE_DSV] = "D3D12_DESCRIPTOR_HEAP_TYPE_DSV";
-
- bIsInitialized = true;
- }
- VERIFY_EXPR(Type >= 0 && Type < D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES);
- return HeapTypeNames[Type];
- }
-#endif
-}