From 07b4b3f36cb8be8c44f57f72afca6247fe5acd7e Mon Sep 17 00:00:00 2001
From: Simeon Hermann <shermann04@uni-koblenz.de>
Date: Wed, 26 May 2021 11:20:23 +0200
Subject: [PATCH] [#9] removed some unnecessary namespace references
---
src/vkcv/DescriptorManager.cpp | 18 +++++++++---------
src/vkcv/DescriptorManager.hpp | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/vkcv/DescriptorManager.cpp b/src/vkcv/DescriptorManager.cpp
index f4f2de16..8226c278 100644
--- a/src/vkcv/DescriptorManager.cpp
+++ b/src/vkcv/DescriptorManager.cpp
@@ -59,11 +59,11 @@ namespace vkcv
vk::DescriptorType DescriptorManager::convertDescriptorTypeFlag(DescriptorType type) {
switch (type)
{
- case vkcv::DescriptorType::UNIFORM_BUFFER:
+ case DescriptorType::UNIFORM_BUFFER:
return vk::DescriptorType::eUniformBuffer;
- case vkcv::DescriptorType::SAMPLER:
+ case DescriptorType::SAMPLER:
return vk::DescriptorType::eSampler;
- case vkcv::DescriptorType::IMAGE:
+ case DescriptorType::IMAGE:
return vk::DescriptorType::eSampledImage;
}
}
@@ -71,17 +71,17 @@ namespace vkcv
vk::ShaderStageFlagBits DescriptorManager::convertShaderStageFlag(ShaderStage stage) {
switch (stage)
{
- case vkcv::ShaderStage::VERTEX:
+ case ShaderStage::VERTEX:
return vk::ShaderStageFlagBits::eVertex;
- case vkcv::ShaderStage::FRAGMENT:
+ case ShaderStage::FRAGMENT:
return vk::ShaderStageFlagBits::eFragment;
- case vkcv::ShaderStage::TESS_CONTROL:
+ case ShaderStage::TESS_CONTROL:
return vk::ShaderStageFlagBits::eTessellationControl;
- case vkcv::ShaderStage::TESS_EVAL:
+ case ShaderStage::TESS_EVAL:
return vk::ShaderStageFlagBits::eTessellationControl;
- case vkcv::ShaderStage::GEOMETRY:
+ case ShaderStage::GEOMETRY:
return vk::ShaderStageFlagBits::eGeometry;
- case vkcv::ShaderStage::COMPUTE:
+ case ShaderStage::COMPUTE:
return vk::ShaderStageFlagBits::eCompute;
}
}
diff --git a/src/vkcv/DescriptorManager.hpp b/src/vkcv/DescriptorManager.hpp
index b699d259..2b04ddc4 100644
--- a/src/vkcv/DescriptorManager.hpp
+++ b/src/vkcv/DescriptorManager.hpp
@@ -57,6 +57,6 @@ namespace vkcv
* @param[in] vkcv flag of the ShaderStage (see ShaderProgram.hpp)
* @return vk flag of the ShaderStage
*/
- vk::ShaderStageFlagBits vkcv::DescriptorManager::convertShaderStageFlag(ShaderStage stage);
+ vk::ShaderStageFlagBits DescriptorManager::convertShaderStageFlag(ShaderStage stage);
};
}
\ No newline at end of file
--
GitLab