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
43
data/shaders/hlsl/texturecubemap/reflect.frag
Normal file
43
data/shaders/hlsl/texturecubemap/reflect.frag
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
// Copyright 2020 Google LLC
|
||||
|
||||
TextureCube textureColor : register(t1);
|
||||
SamplerState samplerColor : register(s1);
|
||||
|
||||
struct UBO
|
||||
{
|
||||
float4x4 projection;
|
||||
float4x4 model;
|
||||
float4x4 invModel;
|
||||
float lodBias;
|
||||
};
|
||||
|
||||
cbuffer ubo : register(b0) { UBO ubo; }
|
||||
|
||||
struct VSOutput
|
||||
{
|
||||
[[vk::location(0)]] float3 Pos : POSITION0;
|
||||
[[vk::location(1)]] float3 Normal : NORMAL0;
|
||||
[[vk::location(2)]] float LodBias : TEXCOORD3;
|
||||
[[vk::location(3)]] float3 ViewVec : TEXCOORD1;
|
||||
[[vk::location(4)]] float3 LightVec : TEXCOORD2;
|
||||
};
|
||||
|
||||
float4 main(VSOutput input) : SV_TARGET
|
||||
{
|
||||
float3 cI = normalize (input.ViewVec);
|
||||
float3 cR = reflect (cI, normalize(input.Normal));
|
||||
|
||||
cR = mul(ubo.invModel, float4(cR, 0.0)).xyz;
|
||||
cR.x *= -1.0;
|
||||
|
||||
float4 color = textureColor.SampleLevel(samplerColor, cR, input.LodBias);
|
||||
|
||||
float3 N = normalize(input.Normal);
|
||||
float3 L = normalize(input.LightVec);
|
||||
float3 V = normalize(input.ViewVec);
|
||||
float3 R = reflect(-L, N);
|
||||
float3 ambient = float3(0.5, 0.5, 0.5) * color.rgb;
|
||||
float3 diffuse = max(dot(N, L), 0.0) * float3(1.0, 1.0, 1.0);
|
||||
float3 specular = pow(max(dot(R, V), 0.0), 16.0) * float3(0.5, 0.5, 0.5);
|
||||
return float4(ambient + diffuse * color.rgb + specular, 1.0);
|
||||
}
|
||||
42
data/shaders/hlsl/texturecubemap/reflect.vert
Normal file
42
data/shaders/hlsl/texturecubemap/reflect.vert
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
// Copyright 2020 Google LLC
|
||||
|
||||
struct VSInput
|
||||
{
|
||||
[[vk::location(0)]] float3 Pos : POSITION0;
|
||||
[[vk::location(1)]] float3 Normal : NORMAL0;
|
||||
};
|
||||
|
||||
struct UBO
|
||||
{
|
||||
float4x4 projection;
|
||||
float4x4 model;
|
||||
float4x4 invModel;
|
||||
float lodBias;
|
||||
};
|
||||
|
||||
cbuffer ubo : register(b0) { UBO ubo; }
|
||||
|
||||
struct VSOutput
|
||||
{
|
||||
float4 Pos : SV_POSITION;
|
||||
[[vk::location(0)]] float3 WorldPos : POSITION0;
|
||||
[[vk::location(1)]] float3 Normal : NORMAL0;
|
||||
[[vk::location(2)]] float LodBias : TEXCOORD3;
|
||||
[[vk::location(3)]] float3 ViewVec : TEXCOORD1;
|
||||
[[vk::location(4)]] float3 LightVec : TEXCOORD2;
|
||||
};
|
||||
|
||||
VSOutput main(VSInput input)
|
||||
{
|
||||
VSOutput output = (VSOutput)0;
|
||||
output.Pos = mul(ubo.projection, mul(ubo.model, float4(input.Pos.xyz, 1.0)));
|
||||
|
||||
output.WorldPos = mul(ubo.model, float4(input.Pos, 1.0)).xyz;
|
||||
output.Normal = mul((float3x3)ubo.model, input.Normal);
|
||||
output.LodBias = ubo.lodBias;
|
||||
|
||||
float3 lightPos = float3(0.0f, -5.0f, 5.0f);
|
||||
output.LightVec = lightPos.xyz - output.WorldPos.xyz;
|
||||
output.ViewVec = -output.WorldPos;
|
||||
return output;
|
||||
}
|
||||
9
data/shaders/hlsl/texturecubemap/skybox.frag
Normal file
9
data/shaders/hlsl/texturecubemap/skybox.frag
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
// Copyright 2020 Google LLC
|
||||
|
||||
TextureCube textureCubeMap : register(t1);
|
||||
SamplerState samplerCubeMap : register(s1);
|
||||
|
||||
float4 main([[vk::location(0)]] float3 inUVW : TEXCOORD0) : SV_TARGET
|
||||
{
|
||||
return textureCubeMap.Sample(samplerCubeMap, inUVW);
|
||||
}
|
||||
24
data/shaders/hlsl/texturecubemap/skybox.vert
Normal file
24
data/shaders/hlsl/texturecubemap/skybox.vert
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
// Copyright 2020 Google LLC
|
||||
|
||||
struct UBO
|
||||
{
|
||||
float4x4 projection;
|
||||
float4x4 model;
|
||||
};
|
||||
|
||||
cbuffer ubo : register(b0) { UBO ubo; }
|
||||
|
||||
struct VSOutput
|
||||
{
|
||||
float4 Pos : SV_POSITION;
|
||||
[[vk::location(0)]] float3 UVW : TEXCOORD0;
|
||||
};
|
||||
|
||||
VSOutput main([[vk::location(0)]] float3 Pos : POSITION0)
|
||||
{
|
||||
VSOutput output = (VSOutput)0;
|
||||
output.UVW = Pos;
|
||||
output.UVW.x *= -1.0;
|
||||
output.Pos = mul(ubo.projection, mul(ubo.model, float4(Pos.xyz, 1.0)));
|
||||
return output;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue