From 8b36ac5f764393eafe4e222c8f62ffec24325f44 Mon Sep 17 00:00:00 2001 From: saschawillems Date: Sat, 24 Feb 2018 10:36:38 +0100 Subject: [PATCH] Moved shader into properly named sub folder --- data/shaders/cubemap/generate-spirv.bat | 6 ------ .../{cubemap => texturecubemap}/reflect.frag | 0 .../{cubemap => texturecubemap}/reflect.frag.spv | Bin .../{cubemap => texturecubemap}/reflect.vert | 0 .../{cubemap => texturecubemap}/reflect.vert.spv | Bin .../shaders/{cubemap => texturecubemap}/skybox.frag | 0 .../{cubemap => texturecubemap}/skybox.frag.spv | Bin .../shaders/{cubemap => texturecubemap}/skybox.vert | 0 .../{cubemap => texturecubemap}/skybox.vert.spv | Bin examples/texturecubemap/texturecubemap.cpp | 9 +++++---- 10 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 data/shaders/cubemap/generate-spirv.bat rename data/shaders/{cubemap => texturecubemap}/reflect.frag (100%) rename data/shaders/{cubemap => texturecubemap}/reflect.frag.spv (100%) rename data/shaders/{cubemap => texturecubemap}/reflect.vert (100%) rename data/shaders/{cubemap => texturecubemap}/reflect.vert.spv (100%) rename data/shaders/{cubemap => texturecubemap}/skybox.frag (100%) rename data/shaders/{cubemap => texturecubemap}/skybox.frag.spv (100%) rename data/shaders/{cubemap => texturecubemap}/skybox.vert (100%) rename data/shaders/{cubemap => texturecubemap}/skybox.vert.spv (100%) diff --git a/data/shaders/cubemap/generate-spirv.bat b/data/shaders/cubemap/generate-spirv.bat deleted file mode 100644 index 84dbe1bd..00000000 --- a/data/shaders/cubemap/generate-spirv.bat +++ /dev/null @@ -1,6 +0,0 @@ -glslangvalidator -V reflect.vert -o reflect.vert.spv -glslangvalidator -V reflect.frag -o reflect.frag.spv -glslangvalidator -V skybox.vert -o skybox.vert.spv -glslangvalidator -V skybox.frag -o skybox.frag.spv - - diff --git a/data/shaders/cubemap/reflect.frag b/data/shaders/texturecubemap/reflect.frag similarity index 100% rename from data/shaders/cubemap/reflect.frag rename to data/shaders/texturecubemap/reflect.frag diff --git a/data/shaders/cubemap/reflect.frag.spv b/data/shaders/texturecubemap/reflect.frag.spv similarity index 100% rename from data/shaders/cubemap/reflect.frag.spv rename to data/shaders/texturecubemap/reflect.frag.spv diff --git a/data/shaders/cubemap/reflect.vert b/data/shaders/texturecubemap/reflect.vert similarity index 100% rename from data/shaders/cubemap/reflect.vert rename to data/shaders/texturecubemap/reflect.vert diff --git a/data/shaders/cubemap/reflect.vert.spv b/data/shaders/texturecubemap/reflect.vert.spv similarity index 100% rename from data/shaders/cubemap/reflect.vert.spv rename to data/shaders/texturecubemap/reflect.vert.spv diff --git a/data/shaders/cubemap/skybox.frag b/data/shaders/texturecubemap/skybox.frag similarity index 100% rename from data/shaders/cubemap/skybox.frag rename to data/shaders/texturecubemap/skybox.frag diff --git a/data/shaders/cubemap/skybox.frag.spv b/data/shaders/texturecubemap/skybox.frag.spv similarity index 100% rename from data/shaders/cubemap/skybox.frag.spv rename to data/shaders/texturecubemap/skybox.frag.spv diff --git a/data/shaders/cubemap/skybox.vert b/data/shaders/texturecubemap/skybox.vert similarity index 100% rename from data/shaders/cubemap/skybox.vert rename to data/shaders/texturecubemap/skybox.vert diff --git a/data/shaders/cubemap/skybox.vert.spv b/data/shaders/texturecubemap/skybox.vert.spv similarity index 100% rename from data/shaders/cubemap/skybox.vert.spv rename to data/shaders/texturecubemap/skybox.vert.spv diff --git a/examples/texturecubemap/texturecubemap.cpp b/examples/texturecubemap/texturecubemap.cpp index ba9dfa9d..468b4cea 100644 --- a/examples/texturecubemap/texturecubemap.cpp +++ b/examples/texturecubemap/texturecubemap.cpp @@ -610,8 +610,6 @@ public: // Skybox pipeline (background cube) std::array shaderStages; - shaderStages[0] = loadShader(getAssetPath() + "shaders/cubemap/skybox.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShader(getAssetPath() + "shaders/cubemap/skybox.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); VkGraphicsPipelineCreateInfo pipelineCreateInfo = vks::initializers::pipelineCreateInfo( @@ -630,11 +628,14 @@ public: pipelineCreateInfo.stageCount = shaderStages.size(); pipelineCreateInfo.pStages = shaderStages.data(); + // Skybox pipeline (background cube) + shaderStages[0] = loadShader(getAssetPath() + "shaders/texturecubemap/skybox.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader(getAssetPath() + "shaders/texturecubemap/skybox.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); VK_CHECK_RESULT(vkCreateGraphicsPipelines(device, pipelineCache, 1, &pipelineCreateInfo, nullptr, &pipelines.skybox)); // Cube map reflect pipeline - shaderStages[0] = loadShader(getAssetPath() + "shaders/cubemap/reflect.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); - shaderStages[1] = loadShader(getAssetPath() + "shaders/cubemap/reflect.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); + shaderStages[0] = loadShader(getAssetPath() + "shaders/texturecubemap/reflect.vert.spv", VK_SHADER_STAGE_VERTEX_BIT); + shaderStages[1] = loadShader(getAssetPath() + "shaders/texturecubemap/reflect.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT); // Enable depth test and write depthStencilState.depthWriteEnable = VK_TRUE; depthStencilState.depthTestEnable = VK_TRUE;