From d40be9fccf8b258a9d87235e292b2b38498b8a39 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 10 Jan 2019 12:53:35 +0300 Subject: [PATCH] [Vulkan] Fixed paths --- shaders/vulkan_program_pool.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/shaders/vulkan_program_pool.cpp b/shaders/vulkan_program_pool.cpp index a215b816c2..f96765f547 100644 --- a/shaders/vulkan_program_pool.cpp +++ b/shaders/vulkan_program_pool.cpp @@ -22,8 +22,8 @@ namespace vulkan { namespace { -std::string const kShadersDir = "vulkan_shaders/"; -std::string const kShadersReflecton = kShadersDir + "reflection.json"; +std::string const kShadersDir = "vulkan_shaders"; +std::string const kShadersReflecton = "reflection.json"; std::vector ReadShaderFile(std::string const & filename) { @@ -118,18 +118,16 @@ VkShaderModule LoadShaderModule(VkDevice device, std::string const & filename) VulkanProgramPool::VulkanProgramPool(VkDevice device) : m_device(device) { - auto reflection = ReadReflectionFile(kShadersReflecton); + auto reflection = ReadReflectionFile(base::JoinPath(kShadersDir, kShadersReflecton)); CHECK_EQUAL(reflection.size(), static_cast(Program::ProgramsCount), ()); for (size_t i = 0; i < static_cast(Program::ProgramsCount); ++i) { auto const programName = DebugPrint(static_cast(i)); - auto const shaderPath = kShadersDir + programName; - m_programs[i] = make_unique_dp( programName, std::move(reflection[i]), - LoadShaderModule(device, shaderPath + ".vert.spv"), - LoadShaderModule(device, shaderPath + ".frag.spv")); + LoadShaderModule(device, base::JoinPath(kShadersDir, programName + ".vert.spv")), + LoadShaderModule(device, base::JoinPath(kShadersDir, programName + ".frag.spv"))); } ProgramParams::Init();