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:
parent
cac1d2e850
commit
ca884587a4
1043 changed files with 1207 additions and 1201 deletions
2
data/shaders/glsl/sphericalenvmapping/generate-spirv.bat
Normal file
2
data/shaders/glsl/sphericalenvmapping/generate-spirv.bat
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
glslangvalidator -V sem.vert -o sem.vert.spv
|
||||
glslangvalidator -V sem.frag -o sem.frag.spv
|
||||
19
data/shaders/glsl/sphericalenvmapping/sem.frag
Normal file
19
data/shaders/glsl/sphericalenvmapping/sem.frag
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
#version 450
|
||||
|
||||
layout (binding = 1) uniform sampler2DArray matCap;
|
||||
|
||||
layout (location = 0) in vec3 inColor;
|
||||
layout (location = 1) in vec3 inEyePos;
|
||||
layout (location = 2) in vec3 inNormal;
|
||||
layout (location = 3) in flat int inTexIndex;
|
||||
|
||||
layout (location = 0) out vec4 outFragColor;
|
||||
|
||||
void main()
|
||||
{
|
||||
vec3 r = reflect( inEyePos, inNormal );
|
||||
vec3 r2 = vec3( r.x, r.y, r.z + 1.0 );
|
||||
float m = 2.0 * length( r2 );
|
||||
vec2 vN = r.xy / m + .5;
|
||||
outFragColor = vec4( texture( matCap, vec3(vN, inTexIndex)).rgb * (clamp(inColor.r * 2, 0.0, 1.0)), 1.0 );
|
||||
}
|
||||
BIN
data/shaders/glsl/sphericalenvmapping/sem.frag.spv
Normal file
BIN
data/shaders/glsl/sphericalenvmapping/sem.frag.spv
Normal file
Binary file not shown.
31
data/shaders/glsl/sphericalenvmapping/sem.vert
Normal file
31
data/shaders/glsl/sphericalenvmapping/sem.vert
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
#version 450
|
||||
|
||||
layout (location = 0) in vec4 inPos;
|
||||
layout (location = 1) in vec3 inNormal;
|
||||
layout (location = 3) in vec3 inColor;
|
||||
|
||||
layout (binding = 0) uniform UBO
|
||||
{
|
||||
mat4 projection;
|
||||
mat4 model;
|
||||
mat4 normal;
|
||||
mat4 view;
|
||||
int texIndex;
|
||||
} ubo;
|
||||
|
||||
layout (location = 0) out vec3 outColor;
|
||||
layout (location = 1) out vec3 outEyePos;
|
||||
layout (location = 2) out vec3 outNormal;
|
||||
layout (location = 3) out flat int outTexIndex;
|
||||
|
||||
void main()
|
||||
{
|
||||
outColor = inColor;
|
||||
mat4 modelView = ubo.view * ubo.model;
|
||||
outEyePos = normalize( vec3( modelView * inPos ) );
|
||||
outTexIndex = ubo.texIndex;
|
||||
outNormal = normalize( mat3(ubo.normal) * inNormal );
|
||||
vec3 r = reflect( outEyePos, outNormal );
|
||||
float m = 2.0 * sqrt( pow(r.x, 2.0) + pow(r.y, 2.0) + pow(r.z + 1.0, 2.0));
|
||||
gl_Position = ubo.projection * modelView * inPos;
|
||||
}
|
||||
BIN
data/shaders/glsl/sphericalenvmapping/sem.vert.spv
Normal file
BIN
data/shaders/glsl/sphericalenvmapping/sem.vert.spv
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue