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
This commit is contained in:
Ben Clayton 2020-05-29 16:08:53 +01:00
parent cac1d2e850
commit ca884587a4
1043 changed files with 1207 additions and 1201 deletions

View file

@ -0,0 +1,2 @@
glslangvalidator -V instancing.vert -o instancing.vert.spv
glslangvalidator -V instancing.frag -o instancing.frag.spv

View file

@ -0,0 +1,12 @@
#version 450
layout (binding = 1) uniform sampler2DArray samplerArray;
layout (location = 0) in vec3 inUV;
layout (location = 0) out vec4 outFragColor;
void main()
{
outFragColor = texture(samplerArray, inUV);
}

Binary file not shown.

View file

@ -0,0 +1,26 @@
#version 450
layout (location = 0) in vec3 inPos;
layout (location = 1) in vec2 inUV;
struct Instance
{
mat4 model;
vec4 arrayIndex;
};
layout (binding = 0) uniform UBO
{
mat4 projection;
mat4 view;
Instance instance[8];
} ubo;
layout (location = 0) out vec3 outUV;
void main()
{
outUV = vec3(inUV, ubo.instance[gl_InstanceIndex].arrayIndex.x);
mat4 modelView = ubo.view * ubo.instance[gl_InstanceIndex].model;
gl_Position = ubo.projection * modelView * vec4(inPos, 1.0);
}

Binary file not shown.