From 50e28c0bbaa76c6b62dfbd3b85b22a4a49f8a657 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Thu, 15 Jun 2017 11:25:06 +0200
Subject: [PATCH] Moved shaders for triangle example into separate directory

---
 data/shaders/spirv-triangle.bat               |   3 ---
 data/shaders/{ => triangle}/triangle.frag     |   0
 data/shaders/{ => triangle}/triangle.frag.spv | Bin
 data/shaders/{ => triangle}/triangle.vert     |   0
 data/shaders/{ => triangle}/triangle.vert.spv | Bin
 triangle/triangle.cpp                         |   4 ++--
 6 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 data/shaders/spirv-triangle.bat
 rename data/shaders/{ => triangle}/triangle.frag (100%)
 rename data/shaders/{ => triangle}/triangle.frag.spv (100%)
 rename data/shaders/{ => triangle}/triangle.vert (100%)
 rename data/shaders/{ => triangle}/triangle.vert.spv (100%)

diff --git a/data/shaders/spirv-triangle.bat b/data/shaders/spirv-triangle.bat
deleted file mode 100644
index 0459876d..00000000
--- a/data/shaders/spirv-triangle.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-glslangvalidator -V triangle.vert -o triangle.vert.spv
-glslangvalidator -V triangle.frag -o triangle.frag.spv
-
diff --git a/data/shaders/triangle.frag b/data/shaders/triangle/triangle.frag
similarity index 100%
rename from data/shaders/triangle.frag
rename to data/shaders/triangle/triangle.frag
diff --git a/data/shaders/triangle.frag.spv b/data/shaders/triangle/triangle.frag.spv
similarity index 100%
rename from data/shaders/triangle.frag.spv
rename to data/shaders/triangle/triangle.frag.spv
diff --git a/data/shaders/triangle.vert b/data/shaders/triangle/triangle.vert
similarity index 100%
rename from data/shaders/triangle.vert
rename to data/shaders/triangle/triangle.vert
diff --git a/data/shaders/triangle.vert.spv b/data/shaders/triangle/triangle.vert.spv
similarity index 100%
rename from data/shaders/triangle.vert.spv
rename to data/shaders/triangle/triangle.vert.spv
diff --git a/triangle/triangle.cpp b/triangle/triangle.cpp
index 4f74b9d3..93c0f6d5 100644
--- a/triangle/triangle.cpp
+++ b/triangle/triangle.cpp
@@ -966,7 +966,7 @@ public:
 		// Set pipeline stage for this shader
 		shaderStages[0].stage = VK_SHADER_STAGE_VERTEX_BIT;
 		// Load binary SPIR-V shader
-		shaderStages[0].module = loadSPIRVShader(getAssetPath() + "shaders/triangle.vert.spv");
+		shaderStages[0].module = loadSPIRVShader(getAssetPath() + "shaders/triangle/triangle.vert.spv");
 		// Main entry point for the shader
 		shaderStages[0].pName = "main";
 		assert(shaderStages[0].module != VK_NULL_HANDLE);
@@ -976,7 +976,7 @@ public:
 		// Set pipeline stage for this shader
 		shaderStages[1].stage = VK_SHADER_STAGE_FRAGMENT_BIT;
 		// Load binary SPIR-V shader
-		shaderStages[1].module = loadSPIRVShader(getAssetPath() + "shaders/triangle.frag.spv");
+		shaderStages[1].module = loadSPIRVShader(getAssetPath() + "shaders/triangle/triangle.frag.spv");
 		// Main entry point for the shader
 		shaderStages[1].pName = "main";
 		assert(shaderStages[1].module != VK_NULL_HANDLE);