lightling/DX11Starter
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hlsli reorganization

Browse source
This commit is contained in:
lightling 2022-03-19 16:55:22 -04:00
parent a4bfd4e0c3
commit 66e2741912
Signed by: lightling
GPG key ID: 016F11E0AA296B67
11 changed files with 177 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DX11Starter.vcxproj
View file

@ -293,7 +293,10 @@
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<None Include="Includes.hlsli" />
<None Include="Helpers.hlsli" />
<None Include="Defines.hlsli" />
<None Include="Lights.hlsli" />
<None Include="ThirdPartyFunctions.hlsli" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

11
DX11Starter.vcxproj.filters
View file

@ -128,7 +128,16 @@
</CopyFileToFolders>
</ItemGroup>
<ItemGroup>
<None Include="Includes.hlsli">
<None Include="Helpers.hlsli">
<Filter>Shaders</Filter>
</None>
<None Include="ThirdPartyFunctions.hlsli">
<Filter>Shaders</Filter>
</None>
<None Include="Defines.hlsli">
<Filter>Shaders</Filter>
</None>
<None Include="Lights.hlsli">
<Filter>Shaders</Filter>
</None>
</ItemGroup>

35
Defines.hlsli Normal file
View file

@ -0,0 +1,35 @@
#ifndef __SHADER_DEFINES__
#define __SHADER_DEFINES__
#define MAX_SPECULAR_EXPONENT 256.0f
// Struct representing the data we expect to receive from earlier pipeline stages
// - Should match the output of our corresponding vertex shader
struct VertexToPixel
{
// Data type
// |
// | Name Semantic
// | | |
// v v v
float4 screenPosition : SV_POSITION;
float2 uv : TEXCOORD;
float3 normal : NORMAL;
float3 worldPosition : POSITION;
};
// Struct representing a single vertex worth of data
// - This should match Vertex.h
struct VertexShaderInput
{
// Data type
// |
// | Name Semantic
// | | |
// v v v
float3 localPosition : POSITION;
float3 normal : NORMAL;
float2 uv : TEXCOORD;
};
#endif

6
Helpers.hlsli Normal file
View file

@ -0,0 +1,6 @@
#ifndef __SHADER_HELPERS__
#define __SHADER_HELPERS__
#endif

148
Includes.hlsli
View file

@ -1,148 +0,0 @@
#ifndef __SHADER_INCLUDES__
#define __SHADER_INCLUDES__
#define LIGHT_TYPE_DIRECTIONAL 0
#define LIGHT_TYPE_POINT 1
#define LIGHT_TYPE_SPOT 2
#define MAX_SPECULAR_EXPONENT 256.0f
// Struct representing the data stored in the Lights.h struct Light
struct Light
{
int Type;
float3 Direction;
float Range;
float3 Position;
float Intensity;
float3 Color;
float SpotFalloff;
float3 Padding;
};
// Struct representing the data we expect to receive from earlier pipeline stages
// - Should match the output of our corresponding vertex shader
// - The name of the struct itself is unimportant
// - The variable names don't have to match other shaders (just the semantics)
// - Each variable must have a semantic, which defines its usage
struct VertexToPixel
{
// Data type
// |
// | Name Semantic
// | | |
// v v v
float4 screenPosition : SV_POSITION;
float2 uv : TEXCOORD;
float3 normal : NORMAL;
float3 worldPosition : POSITION;
};
// Struct representing a single vertex worth of data
// - This should match the vertex definition in our C++ code
// - By "match", I mean the size, order and number of members
// - The name of the struct itself is unimportant, but should be descriptive
// - Each variable must have a semantic, which defines its usage
struct VertexShaderInput
{
// Data type
// |
// | Name Semantic
// | | |
// v v v
float3 localPosition : POSITION;
float3 normal : NORMAL;
float2 uv : TEXCOORD;
};
/// BEGIN THIRD PARTY ///
/// SOURCE: https://thebookofshaders.com/edit.php#11/2d-snoise-clear.frag ///
// Some useful functions
float3 mod289(float3 x) { return x - floor(x * (1.0 / 289.0)) * 289.0; }
float2 mod289(float2 x) { return x - floor(x * (1.0 / 289.0)) * 289.0; }
float3 permute(float3 x) { return mod289(((x * 34.0) + 1.0) * x); }
//
// Description : GLSL 2D simplex noise function
// Author : Ian McEwan, Ashima Arts
// Maintainer : ijm
// Lastmod : 20110822 (ijm)
// License :
// Copyright (C) 2011 Ashima Arts. All rights reserved.
// Distributed under the MIT License. See LICENSE file.
// https://github.com/ashima/webgl-noise
//
float snoise(float2 v)
{
// Precompute values for skewed triangular grid
const float4 C = float4(0.211324865405187,
// (3.0-sqrt(3.0))/6.0
0.366025403784439,
// 0.5*(sqrt(3.0)-1.0)
-0.577350269189626,
// -1.0 + 2.0 * C.x
0.024390243902439);
// 1.0 / 41.0
// First corner (x0)
float2 i = floor(v + dot(v, C.yy));
float2 x0 = v - i + dot(i, C.xx);
// Other two corners (x1, x2)
float2 i1 = float2(0, 0);
i1 = (x0.x > x0.y) ? float2(1.0, 0.0) : float2(0.0, 1.0);
float2 x1 = x0.xy + C.xx - i1;
float2 x2 = x0.xy + C.zz;
// Do some permutations to avoid
// truncation effects in permutation
i = mod289(i);
float3 p = permute(
permute(i.y + float3(0.0, i1.y, 1.0))
+ i.x + float3(0.0, i1.x, 1.0));
float3 m = max(0.5 - float3(
dot(x0, x0),
dot(x1, x1),
dot(x2, x2)
), 0.0);
m = m * m;
m = m * m;
// Gradients:
// 41 pts uniformly over a line, mapped onto a diamond
// The ring size 17*17 = 289 is close to a multiple
// of 41 (41*7 = 287)
float3 x = 2.0 * frac(p * C.www) - 1.0;
float3 h = abs(x) - 0.5;
float3 ox = floor(x + 0.5);
float3 a0 = x - ox;
// Normalise gradients implicitly by scaling m
// Approximation of: m *= inversesqrt(a0*a0 + h*h);
m *= 1.79284291400159 - 0.85373472095314 * (a0 * a0 + h * h);
// Compute final noise value at P
float3 g = float3(0, 0, 0);
g.x = a0.x * x0.x + h.x * x0.y;
g.yz = a0.yz * float2(x1.x, x2.x) + h.yz * float2(x1.y, x2.y);
return 130.0 * dot(m, g);
}
/// SOURCE: https://thebookofshaders.com/10/ ///
float random(float2 st)
{
return frac(sin(dot(st.xy,
float2(12.9898, 78.233))) *
43758.5453123);
}
/// END THIRD PARTY ///
#endif

25
Lights.hlsli Normal file
View file

@ -0,0 +1,25 @@
#ifndef __SHADER_LIGHTS__
#define __SHADER_LIGHTS__
#define LIGHT_TYPE_DIRECTIONAL 0
#define LIGHT_TYPE_POINT 1
#define LIGHT_TYPE_SPOT 2
// Struct representing light data
// - This should match Lights.h
struct Light
{
int Type;
float3 Direction;
float Range;
float3 Position;
float Intensity;
float3 Color;
float SpotFalloff;
float3 Padding;
};
#endif

2
PixelShader.hlsl
View file

@ -1,4 +1,4 @@
#include "Includes.hlsli"
#include "Defines.hlsli"
cbuffer ExternalData : register(b0)
{

3
RandomPixelShader.hlsl
View file

@ -1,4 +1,5 @@
#include "Includes.hlsli"
#include "Defines.hlsli"
#include "ThirdPartyFunctions.hlsli"
cbuffer ExternalData : register(b0)
{

3
SimplePixelShader.hlsl
View file

@ -1,4 +1,5 @@
#include "Includes.hlsli"
#include "Defines.hlsli"
#include "Lights.hlsli"
cbuffer ExternalData : register(b0)
{

91
ThirdPartyFunctions.hlsli Normal file
View file

@ -0,0 +1,91 @@
#ifndef __SHADER_THIRD_PARTY_FUNCTIONS__
#define __SHADER_THIRD_PARTY_FUNCTIONS__
/// BEGIN THIRD PARTY ///
/// SOURCE: https://thebookofshaders.com/edit.php#11/2d-snoise-clear.frag ///
// Some useful functions
float3 mod289(float3 x) { return x - floor(x * (1.0 / 289.0)) * 289.0; }
float2 mod289(float2 x) { return x - floor(x * (1.0 / 289.0)) * 289.0; }
float3 permute(float3 x) { return mod289(((x * 34.0) + 1.0) * x); }
//
// Description : GLSL 2D simplex noise function
// Author : Ian McEwan, Ashima Arts
// Maintainer : ijm
// Lastmod : 20110822 (ijm)
// License :
// Copyright (C) 2011 Ashima Arts. All rights reserved.
// Distributed under the MIT License. See LICENSE file.
// https://github.com/ashima/webgl-noise
//
float snoise(float2 v)
{
// Precompute values for skewed triangular grid
const float4 C = float4(0.211324865405187,
// (3.0-sqrt(3.0))/6.0
0.366025403784439,
// 0.5*(sqrt(3.0)-1.0)
-0.577350269189626,
// -1.0 + 2.0 * C.x
0.024390243902439);
// 1.0 / 41.0
// First corner (x0)
float2 i = floor(v + dot(v, C.yy));
float2 x0 = v - i + dot(i, C.xx);
// Other two corners (x1, x2)
float2 i1 = float2(0, 0);
i1 = (x0.x > x0.y) ? float2(1.0, 0.0) : float2(0.0, 1.0);
float2 x1 = x0.xy + C.xx - i1;
float2 x2 = x0.xy + C.zz;
// Do some permutations to avoid
// truncation effects in permutation
i = mod289(i);
float3 p = permute(
permute(i.y + float3(0.0, i1.y, 1.0))
+ i.x + float3(0.0, i1.x, 1.0));
float3 m = max(0.5 - float3(
dot(x0, x0),
dot(x1, x1),
dot(x2, x2)
), 0.0);
m = m * m;
m = m * m;
// Gradients:
// 41 pts uniformly over a line, mapped onto a diamond
// The ring size 17*17 = 289 is close to a multiple
// of 41 (41*7 = 287)
float3 x = 2.0 * frac(p * C.www) - 1.0;
float3 h = abs(x) - 0.5;
float3 ox = floor(x + 0.5);
float3 a0 = x - ox;
// Normalise gradients implicitly by scaling m
// Approximation of: m *= inversesqrt(a0*a0 + h*h);
m *= 1.79284291400159 - 0.85373472095314 * (a0 * a0 + h * h);
// Compute final noise value at P
float3 g = float3(0, 0, 0);
g.x = a0.x * x0.x + h.x * x0.y;
g.yz = a0.yz * float2(x1.x, x2.x) + h.yz * float2(x1.y, x2.y);
return 130.0 * dot(m, g);
}
/// SOURCE: https://thebookofshaders.com/10/ ///
float random(float2 st)
{
return frac(sin(dot(st.xy,
float2(12.9898, 78.233))) *
43758.5453123);
}
/// END THIRD PARTY ///
#endif

2
VertexShader.hlsl
View file

@ -1,4 +1,4 @@
#include "Includes.hlsli"
#include "Defines.hlsli"
cbuffer ExternalData : register(b0)
{