From c7b2d04200baa1b602b670cf9a7cbdfb9f616ae0 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Thu, 8 Mar 2018 16:48:08 +0100 Subject: [PATCH] Parallax mapping sample shader folder name --- .../{parallax => parallaxmapping}/parallax.frag | 0 .../{parallax => parallaxmapping}/parallax.frag.spv | Bin .../{parallax => parallaxmapping}/parallax.vert | 0 .../{parallax => parallaxmapping}/parallax.vert.spv | Bin examples/parallaxmapping/parallaxmapping.cpp | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename data/shaders/{parallax => parallaxmapping}/parallax.frag (100%) rename data/shaders/{parallax => parallaxmapping}/parallax.frag.spv (100%) rename data/shaders/{parallax => parallaxmapping}/parallax.vert (100%) rename data/shaders/{parallax => parallaxmapping}/parallax.vert.spv (100%) diff --git a/data/shaders/parallax/parallax.frag b/data/shaders/parallaxmapping/parallax.frag similarity index 100% rename from data/shaders/parallax/parallax.frag rename to data/shaders/parallaxmapping/parallax.frag diff --git a/data/shaders/parallax/parallax.frag.spv b/data/shaders/parallaxmapping/parallax.frag.spv similarity index 100% rename from data/shaders/parallax/parallax.frag.spv rename to data/shaders/parallaxmapping/parallax.frag.spv diff --git a/data/shaders/parallax/parallax.vert b/data/shaders/parallaxmapping/parallax.vert similarity index 100% rename from data/shaders/parallax/parallax.vert rename to data/shaders/parallaxmapping/parallax.vert diff --git a/data/shaders/parallax/parallax.vert.spv b/data/shaders/parallaxmapping/parallax.vert.spv similarity index 100% rename from data/shaders/parallax/parallax.vert.spv rename to data/shaders/parallaxmapping/parallax.vert.spv diff --git a/examples/parallaxmapping/parallaxmapping.cpp b/examples/parallaxmapping/parallaxmapping.cpp index 15b44614..6e16c6a2 100644 --- a/examples/parallaxmapping/parallaxmapping.cpp +++ b/examples/parallaxmapping/parallaxmapping.cpp @@ -307,8 +307,8 @@ public: pipelineCreateInfo.pVertexInputState = &vertexInputState; // Parallax mapping modes pipeline - shaderStages[0] = loadShader(getAssetPath() + "shaders/parallax/parallax.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShader(getAssetPath() + "shaders/parallax/parallax.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShader(getAssetPath() + "shaders/parallaxmapping/parallax.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader(getAssetPath() + "shaders/parallaxmapping/parallax.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipeline)); }