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,10 @@
// Copyright 2020 Google LLC
Texture2D textureFont : register(t0);
SamplerState samplerFont : register(s0);
float4 main([[vk::location(0)]]float2 inUV : TEXCOORD0) : SV_TARGET
{
float color = textureFont.Sample(samplerFont, inUV).r;
return float4(color.xxx, 1.0);
}

View file

@ -0,0 +1,21 @@
// Copyright 2020 Google LLC
struct VSInput
{
[[vk::location(0)]]float2 Pos : POSITION0;
[[vk::location(1)]]float2 UV : TEXCOORD0;
};
struct VSOutput
{
float4 Pos : SV_POSITION;
[[vk::location(0)]]float2 UV : TEXCOORD0;
};
VSOutput main(VSInput input)
{
VSOutput output = (VSOutput)0;
output.Pos = float4(input.Pos, 0.0, 1.0);
output.UV = input.UV;
return output;
}

View file

@ -0,0 +1,15 @@
// Copyright 2020 Google LLC
Texture2D fontTexture : register(t0);
SamplerState fontSampler : register(s0);
struct VSOutput
{
[[vk::location(0)]]float2 UV : TEXCOORD0;
[[vk::location(1)]]float4 Color : COLOR0;
};
float4 main(VSOutput input) : SV_TARGET
{
return input.Color * fontTexture.Sample(fontSampler, input.UV);
}

View file

@ -0,0 +1,33 @@
// Copyright 2020 Google LLC
struct VSInput
{
[[vk::location(0)]]float2 Pos : POSITION0;
[[vk::location(1)]]float2 UV : TEXCOORD0;
[[vk::location(2)]]float4 Color : COLOR0;
};
struct VSOutput
{
float4 Pos : SV_POSITION;
[[vk::location(0)]]float2 UV : TEXCOORD0;
[[vk::location(1)]]float4 Color : COLOR0;
};
struct PushConstants
{
float2 scale;
float2 translate;
};
[[vk::push_constant]]
PushConstants pushConstants;
VSOutput main(VSInput input)
{
VSOutput output = (VSOutput)0;
output.Pos = float4(input.Pos * pushConstants.scale + pushConstants.translate, 0.0, 1.0);
output.UV = input.UV;
output.Color = input.Color;
return output;
}