diff --git a/src/vkcv/DescriptorManager.cpp b/src/vkcv/DescriptorManager.cpp index f4f2de16c5cefc07ab0ba9488e28c3a894e99dac..8226c2785eeb7bbcc34de9c55f750cb83d5875b9 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 b699d259da23d3de64fc671956ca4d57ddd7d88a..2b04ddc434a8d4f6e28659df67cb5f7c0d1a7ddb 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