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,45 @@
#version 450
#extension GL_ARB_viewport_array : enable
layout (triangles, invocations = 2) in;
layout (triangle_strip, max_vertices = 3) out;
layout (binding = 0) uniform UBO
{
mat4 projection[2];
mat4 modelview[2];
vec4 lightPos;
} ubo;
layout (location = 0) in vec3 inNormal[];
layout (location = 1) in vec3 inColor[];
layout (location = 0) out vec3 outNormal;
layout (location = 1) out vec3 outColor;
layout (location = 2) out vec3 outViewVec;
layout (location = 3) out vec3 outLightVec;
void main(void)
{
for(int i = 0; i < gl_in.length(); i++)
{
outNormal = mat3(ubo.modelview[gl_InvocationID]) * inNormal[i];
outColor = inColor[i];
vec4 pos = gl_in[i].gl_Position;
vec4 worldPos = (ubo.modelview[gl_InvocationID] * pos);
vec3 lPos = vec3(ubo.modelview[gl_InvocationID] * ubo.lightPos);
outLightVec = lPos - worldPos.xyz;
outViewVec = -worldPos.xyz;
gl_Position = ubo.projection[gl_InvocationID] * worldPos;
// Set the viewport index that the vertex will be emitted to
gl_ViewportIndex = gl_InvocationID;
gl_PrimitiveID = gl_PrimitiveIDIn;
EmitVertex();
}
EndPrimitive();
}

Binary file not shown.

View file

@ -0,0 +1,20 @@
#version 450
layout (location = 0) in vec3 inNormal;
layout (location = 1) in vec3 inColor;
layout (location = 2) in vec3 inViewVec;
layout (location = 3) in vec3 inLightVec;
layout (location = 0) out vec4 outColor;
void main()
{
vec3 N = normalize(inNormal);
vec3 L = normalize(inLightVec);
vec3 V = normalize(inViewVec);
vec3 R = reflect(-L, N);
vec3 ambient = vec3(0.1);
vec3 diffuse = max(dot(N, L), 0.0) * vec3(1.0);
vec3 specular = pow(max(dot(R, V), 0.0), 16.0) * vec3(0.75);
outColor = vec4((ambient + diffuse) * inColor.rgb + specular, 1.0);
}

Binary file not shown.

View file

@ -0,0 +1,15 @@
#version 450
layout (location = 0) in vec3 inPos;
layout (location = 1) in vec3 inNormal;
layout (location = 2) in vec3 inColor;
layout (location = 0) out vec3 outNormal;
layout (location = 1) out vec3 outColor;
void main()
{
outColor = inColor;
outNormal = inNormal;
gl_Position = vec4(inPos.xyz, 1.0);
}

Binary file not shown.