From df8f3b18f94a36be729fe276496298b8e32b8a94 Mon Sep 17 00:00:00 2001
From: Sascha Willems <webmaster@saschawillems.de>
Date: Fri, 5 Jun 2020 21:27:17 +0200
Subject: [PATCH] Moved glsl shaders

---
 .../{ => glsl}/gltfskinning/skinnedmodel.frag       |   0
 .../{ => glsl}/gltfskinning/skinnedmodel.frag.spv   | Bin
 .../{ => glsl}/gltfskinning/skinnedmodel.vert       |   0
 .../{ => glsl}/gltfskinning/skinnedmodel.vert.spv   | Bin
 examples/gltfskinning/gltfskinning.cpp              |   4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename data/shaders/{ => glsl}/gltfskinning/skinnedmodel.frag (100%)
 rename data/shaders/{ => glsl}/gltfskinning/skinnedmodel.frag.spv (100%)
 rename data/shaders/{ => glsl}/gltfskinning/skinnedmodel.vert (100%)
 rename data/shaders/{ => glsl}/gltfskinning/skinnedmodel.vert.spv (100%)

diff --git a/data/shaders/gltfskinning/skinnedmodel.frag b/data/shaders/glsl/gltfskinning/skinnedmodel.frag
similarity index 100%
rename from data/shaders/gltfskinning/skinnedmodel.frag
rename to data/shaders/glsl/gltfskinning/skinnedmodel.frag
diff --git a/data/shaders/gltfskinning/skinnedmodel.frag.spv b/data/shaders/glsl/gltfskinning/skinnedmodel.frag.spv
similarity index 100%
rename from data/shaders/gltfskinning/skinnedmodel.frag.spv
rename to data/shaders/glsl/gltfskinning/skinnedmodel.frag.spv
diff --git a/data/shaders/gltfskinning/skinnedmodel.vert b/data/shaders/glsl/gltfskinning/skinnedmodel.vert
similarity index 100%
rename from data/shaders/gltfskinning/skinnedmodel.vert
rename to data/shaders/glsl/gltfskinning/skinnedmodel.vert
diff --git a/data/shaders/gltfskinning/skinnedmodel.vert.spv b/data/shaders/glsl/gltfskinning/skinnedmodel.vert.spv
similarity index 100%
rename from data/shaders/gltfskinning/skinnedmodel.vert.spv
rename to data/shaders/glsl/gltfskinning/skinnedmodel.vert.spv
diff --git a/examples/gltfskinning/gltfskinning.cpp b/examples/gltfskinning/gltfskinning.cpp
index 234a9b5d..ea89e63d 100644
--- a/examples/gltfskinning/gltfskinning.cpp
+++ b/examples/gltfskinning/gltfskinning.cpp
@@ -862,8 +862,8 @@ void VulkanExample::preparePipelines()
 	vertexInputStateCI.pVertexAttributeDescriptions = vertexInputAttributes.data();
 
 	const std::array<VkPipelineShaderStageCreateInfo, 2> shaderStages = {
-		loadShader(getAssetPath() + "shaders/gltfskinning/skinnedmodel.vert.spv", VK_SHADER_STAGE_VERTEX_BIT),
-		loadShader(getAssetPath() + "shaders/gltfskinning/skinnedmodel.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT)
+		loadShader(getShadersPath() + "shaders/gltfskinning/skinnedmodel.vert.spv", VK_SHADER_STAGE_VERTEX_BIT),
+		loadShader(getShadersPath() + "shaders/gltfskinning/skinnedmodel.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT)
 	};
 
 	VkGraphicsPipelineCreateInfo pipelineCI = vks::initializers::pipelineCreateInfo(pipelineLayout, renderPass, 0);