Move shaders into glsl and hlsl directories

Move `data/shaders` to `data/shaders/glsl`
Move `data/hlsl` to `data/shaders/hlsl`

Fix up shader paths in the cpp files to point to the new glsl location.

`data/shaders/hlsl/compile.py` still overwrites the glsl .spv files (for
now).

Issue: #723

README.md

@@ -63,7 +63,7 @@ See [BUILD.md](BUILD.md) for details on how to build for the different platforms
 
 ## <a name="Shaders"></a> Shaders
 
-Vulkan consumes shaders in an intermediate representation called SPIR-V. This makes it possible to use different shader languages by compiling them to that bytecode format. The primary shader language used here is [GLSL](data/shaders) but thanks to an external contribution you'll also find [HLSL](data/hlsl) shader sources.
+Vulkan consumes shaders in an intermediate representation called SPIR-V. This makes it possible to use different shader languages by compiling them to that bytecode format. The primary shader language used here is [GLSL](data/shaders/glsl) but thanks to an external contribution you'll also find [HLSL](data/shaders/hlsl) shader sources.
 
 ## <a name="Examples"></a> Examples
 

android/examples/_template/build.gradle

@@ -43,8 +43,8 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 

android/examples/bloom/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/bloom'
-       into 'assets/shaders/bloom'
+       from '../../../data/shaders/glsl/bloom'
+       into 'assets/shaders/glsl/bloom'
        include '*.*'
     }
 

android/examples/computecloth/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computecloth'
-       into 'assets/shaders/computecloth'
+       from '../../../data/shaders/glsl/computecloth'
+       into 'assets/shaders/glsl/computecloth'
        include '*.*'
     }
 

android/examples/computecullandlod/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computecullandlod'
-       into 'assets/shaders/computecullandlod'
+       from '../../../data/shaders/glsl/computecullandlod'
+       into 'assets/shaders/glsl/computecullandlod'
        include '*.*'
     }
 

android/examples/computeheadless/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computeheadless'
-       into 'assets/shaders/computeheadless'
+       from '../../../data/shaders/glsl/computeheadless'
+       into 'assets/shaders/glsl/computeheadless'
        include '*.*'
     }
 

android/examples/computenbody/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computenbody'
-       into 'assets/shaders/computenbody'
+       from '../../../data/shaders/glsl/computenbody'
+       into 'assets/shaders/glsl/computenbody'
        include '*.*'
     }
 

android/examples/computeparticles/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computeparticles'
-       into 'assets/shaders/computeparticles'
+       from '../../../data/shaders/glsl/computeparticles'
+       into 'assets/shaders/glsl/computeparticles'
        include '*.*'
     }
 

android/examples/computeraytracing/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computeraytracing'
-       into 'assets/shaders/computeraytracing'
+       from '../../../data/shaders/glsl/computeraytracing'
+       into 'assets/shaders/glsl/computeraytracing'
        include '*.*'
     }
 

android/examples/computeshader/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/computeshader'
-       into 'assets/shaders/computeshader'
+       from '../../../data/shaders/glsl/computeshader'
+       into 'assets/shaders/glsl/computeshader'
        include '*.*'
     }
 

android/examples/conservativeraster/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/conservativeraster'
-       into 'assets/shaders/conservativeraster'
+       from '../../../data/shaders/glsl/conservativeraster'
+       into 'assets/shaders/glsl/conservativeraster'
        include '*.*'
     }
 

android/examples/debugmarker/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/debugmarker'
-       into 'assets/shaders/debugmarker'
+       from '../../../data/shaders/glsl/debugmarker'
+       into 'assets/shaders/glsl/debugmarker'
        include '*.*'
     }
 

android/examples/deferred/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/deferred'
-       into 'assets/shaders/deferred'
+       from '../../../data/shaders/glsl/deferred'
+       into 'assets/shaders/glsl/deferred'
        include '*.*'
     }
 

android/examples/deferredmultisampling/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/deferredmultisampling'
-       into 'assets/shaders/deferredmultisampling'
+       from '../../../data/shaders/glsl/deferredmultisampling'
+       into 'assets/shaders/glsl/deferredmultisampling'
        include '*.*'
     }
 

android/examples/deferredshadows/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/deferredshadows'
-       into 'assets/shaders/deferredshadows'
+       from '../../../data/shaders/glsl/deferredshadows'
+       into 'assets/shaders/glsl/deferredshadows'
        include '*.*'
     }
 

android/examples/descriptorsets/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/descriptorsets'
-       into 'assets/shaders/descriptorsets'
+       from '../../../data/shaders/glsl/descriptorsets'
+       into 'assets/shaders/glsl/descriptorsets'
        include '*.*'
     }
 

android/examples/displacement/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/displacement'
-       into 'assets/shaders/displacement'
+       from '../../../data/shaders/glsl/displacement'
+       into 'assets/shaders/glsl/displacement'
        include '*.*'
     }
 

android/examples/distancefieldfonts/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/distancefieldfonts'
-       into 'assets/shaders/distancefieldfonts'
+       from '../../../data/shaders/glsl/distancefieldfonts'
+       into 'assets/shaders/glsl/distancefieldfonts'
        include '*.*'
     }
 

android/examples/dynamicuniformbuffer/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/dynamicuniformbuffer'
-       into 'assets/shaders/dynamicuniformbuffer'
+       from '../../../data/shaders/glsl/dynamicuniformbuffer'
+       into 'assets/shaders/glsl/dynamicuniformbuffer'
        include '*.*'
     }
 

android/examples/gears/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/gears'
-       into 'assets/shaders/gears'
+       from '../../../data/shaders/glsl/gears'
+       into 'assets/shaders/glsl/gears'
        include '*.*'
     }
 

android/examples/geometryshader/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/geometryshader'
-       into 'assets/shaders/geometryshader'
+       from '../../../data/shaders/glsl/geometryshader'
+       into 'assets/shaders/glsl/geometryshader'
        include '*.*'
     }
 

android/examples/gltfscene/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/gltfscene'
-       into 'assets/shaders/gltfscene'
+       from '../../../data/shaders/glsl/gltfscene'
+       into 'assets/shaders/glsl/gltfscene'
        include '*.*'
     }
 

android/examples/hdr/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/hdr'
-       into 'assets/shaders/hdr'
+       from '../../../data/shaders/glsl/hdr'
+       into 'assets/shaders/glsl/hdr'
        include '*.*'
     }
 

android/examples/imgui/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/imgui'
-       into 'assets/shaders/imgui'
+       from '../../../data/shaders/glsl/imgui'
+       into 'assets/shaders/glsl/imgui'
        include '*.*'
     }
 

android/examples/indirectdraw/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/indirectdraw'
-       into 'assets/shaders/indirectdraw'
+       from '../../../data/shaders/glsl/indirectdraw'
+       into 'assets/shaders/glsl/indirectdraw'
        include '*.*'
     }
 

android/examples/inlineuniformblocks/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/inlineuniformblocks'
-       into 'assets/shaders/inlineuniformblocks'
+       from '../../../data/shaders/glsl/inlineuniformblocks'
+       into 'assets/shaders/glsl/inlineuniformblocks'
        include '*.*'
     }
 

android/examples/inputattachments/build.gradle

@@ -48,14 +48,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/inputattachments'
-       into 'assets/shaders/inputattachments'
+       from '../../../data/shaders/glsl/inputattachments'
+       into 'assets/shaders/glsl/inputattachments'
        include '*.*'
     }
 

android/examples/instancing/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/instancing'
-       into 'assets/shaders/instancing'
+       from '../../../data/shaders/glsl/instancing'
+       into 'assets/shaders/glsl/instancing'
        include '*.*'
     }
 

android/examples/multisampling/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/multisampling'
-       into 'assets/shaders/mesh'
+       from '../../../data/shaders/glsl/multisampling'
+       into 'assets/shaders/glsl/mesh'
        include '*.*'
     }
 

android/examples/multithreading/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/multithreading'
-       into 'assets/shaders/multithreading'
+       from '../../../data/shaders/glsl/multithreading'
+       into 'assets/shaders/glsl/multithreading'
        include '*.*'
     }
 

android/examples/multiview/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/multiview'
-       into 'assets/shaders/multiview'
+       from '../../../data/shaders/glsl/multiview'
+       into 'assets/shaders/glsl/multiview'
        include '*.*'
     }
 

android/examples/negativeviewportheight/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/negativeviewportheight'
-       into 'assets/shaders/negativeviewportheight'
+       from '../../../data/shaders/glsl/negativeviewportheight'
+       into 'assets/shaders/glsl/negativeviewportheight'
        include '*.*'
     }
 

android/examples/occlusionquery/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/occlusionquery'
-       into 'assets/shaders/occlusionquery'
+       from '../../../data/shaders/glsl/occlusionquery'
+       into 'assets/shaders/glsl/occlusionquery'
        include '*.*'
     }
 

android/examples/offscreen/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/offscreen'
-       into 'assets/shaders/offscreen'
+       from '../../../data/shaders/glsl/offscreen'
+       into 'assets/shaders/glsl/offscreen'
        include '*.*'
     }
 

android/examples/parallaxmapping/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/parallaxmapping'
-       into 'assets/shaders/parallaxmapping'
+       from '../../../data/shaders/glsl/parallaxmapping'
+       into 'assets/shaders/glsl/parallaxmapping'
        include '*.*'
     }
 

android/examples/particlefire/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/particlefire'
-       into 'assets/shaders/particlefire'
+       from '../../../data/shaders/glsl/particlefire'
+       into 'assets/shaders/glsl/particlefire'
        include '*.*'
     }
 

android/examples/pbrbasic/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pbrbasic'
-       into 'assets/shaders/pbrbasic'
+       from '../../../data/shaders/glsl/pbrbasic'
+       into 'assets/shaders/glsl/pbrbasic'
        include '*.*'
     }
 

android/examples/pbribl/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pbribl'
-       into 'assets/shaders/pbribl'
+       from '../../../data/shaders/glsl/pbribl'
+       into 'assets/shaders/glsl/pbribl'
        include '*.*'
     }
 

android/examples/pbrtexture/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pbrtexture'
-       into 'assets/shaders/pbrtexture'
+       from '../../../data/shaders/glsl/pbrtexture'
+       into 'assets/shaders/glsl/pbrtexture'
        include '*.*'
     }
 

android/examples/pipelines/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pipelines'
-       into 'assets/shaders/pipelines'
+       from '../../../data/shaders/glsl/pipelines'
+       into 'assets/shaders/glsl/pipelines'
        include '*.*'
     }
 

android/examples/pipelinestatistics/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pipelinestatistics'
-       into 'assets/shaders/pipelinestatistics'
+       from '../../../data/shaders/glsl/pipelinestatistics'
+       into 'assets/shaders/glsl/pipelinestatistics'
        include '*.*'
     }
 

android/examples/pushconstants/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pushconstants'
-       into 'assets/shaders/pushconstants'
+       from '../../../data/shaders/glsl/pushconstants'
+       into 'assets/shaders/glsl/pushconstants'
        include '*.*'
     }
 

android/examples/pushdescriptors/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/pushdescriptors'
-       into 'assets/shaders/pushdescriptors'
+       from '../../../data/shaders/glsl/pushdescriptors'
+       into 'assets/shaders/glsl/pushdescriptors'
        include '*.*'
     }
 

android/examples/radialblur/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/radialblur'
-       into 'assets/shaders/radialblur'
+       from '../../../data/shaders/glsl/radialblur'
+       into 'assets/shaders/glsl/radialblur'
        include '*.*'
     }
 

android/examples/renderheadless/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/renderheadless'
-       into 'assets/shaders/renderheadless'
+       from '../../../data/shaders/glsl/renderheadless'
+       into 'assets/shaders/glsl/renderheadless'
        include '*.*'
     }
 

android/examples/scenerendering/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/scenerendering'
-       into 'assets/shaders/scenerendering'
+       from '../../../data/shaders/glsl/scenerendering'
+       into 'assets/shaders/glsl/scenerendering'
        include '*.*'
     }
 

android/examples/screenshot/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/screenshot'
-       into 'assets/shaders/screenshot'
+       from '../../../data/shaders/glsl/screenshot'
+       into 'assets/shaders/glsl/screenshot'
        include '*.*'
     }
 

android/examples/shadowmapping/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/shadowmapping'
-       into 'assets/shaders/shadowmapping'
+       from '../../../data/shaders/glsl/shadowmapping'
+       into 'assets/shaders/glsl/shadowmapping'
        include '*.*'
     }
 

android/examples/shadowmappingcascade/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/shadowmappingcascade'
-       into 'assets/shaders/shadowmappingcascade'
+       from '../../../data/shaders/glsl/shadowmappingcascade'
+       into 'assets/shaders/glsl/shadowmappingcascade'
        include '*.*'
     }
 

android/examples/shadowmappingomni/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/shadowmapomni'
-       into 'assets/shaders/shadowmapomni'
+       from '../../../data/shaders/glsl/shadowmapomni'
+       into 'assets/shaders/glsl/shadowmapomni'
        include '*.*'
     }
 

android/examples/skeletalanimation/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/skeletalanimation'
-       into 'assets/shaders/skeletalanimation'
+       from '../../../data/shaders/glsl/skeletalanimation'
+       into 'assets/shaders/glsl/skeletalanimation'
        include '*.*'
     }
 

android/examples/specializationconstants/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/specializationconstants'
-       into 'assets/shaders/specializationconstants'
+       from '../../../data/shaders/glsl/specializationconstants'
+       into 'assets/shaders/glsl/specializationconstants'
        include '*.*'
     }
 

android/examples/sphericalenvmapping/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/sphericalenvmapping'
-       into 'assets/shaders/sphericalenvmapping'
+       from '../../../data/shaders/glsl/sphericalenvmapping'
+       into 'assets/shaders/glsl/sphericalenvmapping'
        include '*.*'
     }
 

android/examples/ssao/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/ssao'
-       into 'assets/shaders/ssao'
+       from '../../../data/shaders/glsl/ssao'
+       into 'assets/shaders/glsl/ssao'
        include '*.*'
     }
 

android/examples/stencilbuffer/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/stencilbuffer'
-       into 'assets/shaders/stencilbuffer'
+       from '../../../data/shaders/glsl/stencilbuffer'
+       into 'assets/shaders/glsl/stencilbuffer'
        include '*.*'
     }
 

android/examples/subpasses/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/subpasses'
-       into 'assets/shaders/subpasses'
+       from '../../../data/shaders/glsl/subpasses'
+       into 'assets/shaders/glsl/subpasses'
        include '*.*'
     }
 

android/examples/terraintessellation/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/terraintessellation'
-       into 'assets/shaders/terraintessellation'
+       from '../../../data/shaders/glsl/terraintessellation'
+       into 'assets/shaders/glsl/terraintessellation'
        include '*.*'
     }
 

android/examples/tessellation/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/tessellation'
-       into 'assets/shaders/tessellation'
+       from '../../../data/shaders/glsl/tessellation'
+       into 'assets/shaders/glsl/tessellation'
        include '*.*'
     }
 

android/examples/textoverlay/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/textoverlay'
-       into 'assets/shaders/textoverlay'
+       from '../../../data/shaders/glsl/textoverlay'
+       into 'assets/shaders/glsl/textoverlay'
        include '*.*'
     }
 

android/examples/texture/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/texture'
-       into 'assets/shaders/texture'
+       from '../../../data/shaders/glsl/texture'
+       into 'assets/shaders/glsl/texture'
        include '*.*'
     }
 

android/examples/texture3d/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/texture3d'
-       into 'assets/shaders/texture3d'
+       from '../../../data/shaders/glsl/texture3d'
+       into 'assets/shaders/glsl/texture3d'
        include '*.*'
     }
 

android/examples/texturearray/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/texturearray'
-       into 'assets/shaders/texturearray'
+       from '../../../data/shaders/glsl/texturearray'
+       into 'assets/shaders/glsl/texturearray'
        include '*.*'
     }
 

android/examples/texturecubemap/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/texturecubemap'
-       into 'assets/shaders/texturecubemap'
+       from '../../../data/shaders/glsl/texturecubemap'
+       into 'assets/shaders/glsl/texturecubemap'
        include '*.*'
     }
 

android/examples/texturemipmapgen/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/texturemipmapgen'
-       into 'assets/shaders/texturemipmapgen'
+       from '../../../data/shaders/glsl/texturemipmapgen'
+       into 'assets/shaders/glsl/texturemipmapgen'
        include '*.*'
     }
 

android/examples/triangle/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/triangle'
-       into 'assets/shaders/triangle'
+       from '../../../data/shaders/glsl/triangle'
+       into 'assets/shaders/glsl/triangle'
        include '*.*'
     }
 

android/examples/viewportarray/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/viewportarray'
-       into 'assets/shaders/viewportarray'
+       from '../../../data/shaders/glsl/viewportarray'
+       into 'assets/shaders/glsl/viewportarray'
        include '*.*'
     }
 

android/examples/vulkanscene/build.gradle

@@ -43,14 +43,14 @@ task copyTask {
     }
 
     copy {
-        from '../../../data/shaders/base'
-        into "assets/shaders/base"
+        from '../../../data/shaders/glsl/base'
+        into 'assets/shaders/glsl/base'
         include '*.spv'
     }
 
     copy {
-       from '../../../data/shaders/vulkanscene'
-       into 'assets/shaders/vulkanscene'
+       from '../../../data/shaders/glsl/vulkanscene'
+       into 'assets/shaders/glsl/vulkanscene'
        include '*.*'
     }
 

base/VulkanTools.cpp

@@ -19,6 +19,11 @@ const std::string getAssetPath()
 #endif
 }
 
+const std::string getShadersPath()
+{
+	return getAssetPath() + "shaders/glsl/";
+}
+
 namespace vks
 {
 	namespace tools

base/VulkanTools.h

@@ -60,6 +60,7 @@
 #endif
 
 const std::string getAssetPath();
+const std::string getShadersPath();
 
 namespace vks
 {

base/vulkanexamplebase.cpp

@@ -155,8 +155,8 @@ void VulkanExampleBase::prepare()
 		UIOverlay.device = vulkanDevice;
 		UIOverlay.queue = queue;
 		UIOverlay.shaders = {
-			loadShader(getAssetPath() + "shaders/base/uioverlay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT),
-			loadShader(getAssetPath() + "shaders/base/uioverlay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT),
+			loadShader(getShadersPath() + "base/uioverlay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT),
+			loadShader(getShadersPath() + "base/uioverlay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT),
 		};
 		UIOverlay.prepareResources();
 		UIOverlay.preparePipeline(pipelineCache, renderPass);