From 1ea4b4faab47bebabde38bf364decefe23f7b206 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Mon, 5 Nov 2018 21:12:08 -0500 Subject: [PATCH] Rename shader files --- CMakeLists.txt | 8 ++++---- shaders/{gfield.frag => dof.frag} | 0 shaders/{gfield.vert => dof.vert} | 0 shaders/{triangle.frag => mesh.frag} | 0 shaders/{triangle.vert => mesh.vert} | 0 src/dofpass.cpp | 4 ++-- src/worldpass.cpp | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) rename shaders/{gfield.frag => dof.frag} (100%) rename shaders/{gfield.vert => dof.vert} (100%) rename shaders/{triangle.frag => mesh.frag} (100%) rename shaders/{triangle.vert => mesh.vert} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 295a3da..d23e332 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,12 +45,12 @@ target_include_directories(Graph if(UNIX) add_shaders(Graph - shaders/triangle.vert - shaders/triangle.frag + shaders/mesh.vert + shaders/mesh.frag shaders/post.vert shaders/post.frag - shaders/gfield.vert - shaders/gfield.frag + shaders/dof.vert + shaders/dof.frag shaders/imgui.vert shaders/imgui.frag) endif() diff --git a/shaders/gfield.frag b/shaders/dof.frag similarity index 100% rename from shaders/gfield.frag rename to shaders/dof.frag diff --git a/shaders/gfield.vert b/shaders/dof.vert similarity index 100% rename from shaders/gfield.vert rename to shaders/dof.vert diff --git a/shaders/triangle.frag b/shaders/mesh.frag similarity index 100% rename from shaders/triangle.frag rename to shaders/mesh.frag diff --git a/shaders/triangle.vert b/shaders/mesh.vert similarity index 100% rename from shaders/triangle.vert rename to shaders/mesh.vert diff --git a/src/dofpass.cpp b/src/dofpass.cpp index e65691a..3d6c2b8 100644 --- a/src/dofpass.cpp +++ b/src/dofpass.cpp @@ -217,8 +217,8 @@ void DoFPass::createDescriptorSetLayout() { } void DoFPass::createPipeline() { - VkShaderModule vertShaderModule = renderer_.createShader("shaders/gfield.vert.spv"); - VkShaderModule fragShaderModule = renderer_.createShader("shaders/gfield.frag.spv"); + VkShaderModule vertShaderModule = renderer_.createShader("shaders/dof.vert.spv"); + VkShaderModule fragShaderModule = renderer_.createShader("shaders/dof.frag.spv"); VkPipelineShaderStageCreateInfo vertShaderStageInfo = {}; vertShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; diff --git a/src/worldpass.cpp b/src/worldpass.cpp index 31c1ebe..2d7a8ca 100644 --- a/src/worldpass.cpp +++ b/src/worldpass.cpp @@ -145,8 +145,8 @@ void WorldPass::createDescriptorSetLayout() { } void WorldPass::createPipeline() { - VkShaderModule vertShaderModule = renderer_.createShader("shaders/triangle.vert.spv"); - VkShaderModule fragShaderModule = renderer_.createShader("shaders/triangle.frag.spv"); + VkShaderModule vertShaderModule = renderer_.createShader("shaders/mesh.vert.spv"); + VkShaderModule fragShaderModule = renderer_.createShader("shaders/mesh.frag.spv"); VkPipelineShaderStageCreateInfo vertShaderStageInfo = {}; vertShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;