Skip to content

Commit

Permalink
refactor: change all possible include files to hlsli
Browse files Browse the repository at this point in the history
  • Loading branch information
FlayaN committed Aug 1, 2024
1 parent 2c64acd commit 2a1cd44
Show file tree
Hide file tree
Showing 23 changed files with 37 additions and 37 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "../Common/Color.hlsl"
#include "../Common/Color.hlsli"

TextureCube<float4> EnvCaptureTexture : register(t0);
TextureCube<float4> ReflectionsTexture : register(t1);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "../Common/Constants.hlsli"
#include "../Common/DeferredShared.hlsli"
#include "../Common/FrameBuffer.hlsl"
#include "../Common/FrameBuffer.hlsli"
#include "../Common/VR.hlsli"

RWTexture2DArray<float4> DynamicCubemap : register(u0);
Expand Down
6 changes: 3 additions & 3 deletions features/Grass Lighting/Shaders/RunGrass.hlsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Common/Color.hlsl"
#include "Common/FrameBuffer.hlsl"
#include "Common/Color.hlsli"
#include "Common/FrameBuffer.hlsli"
#include "Common/GBuffer.hlsli"
#include "Common/MotionBlur.hlsl"
#include "Common/MotionBlur.hlsli"
#include "Common/SharedData.hlsli"

#define GRASS
Expand Down
2 changes: 1 addition & 1 deletion features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include "../Common/FastMath.hlsli"
#include "../Common/FrameBuffer.hlsl"
#include "../Common/FrameBuffer.hlsli"
#include "../Common/GBuffer.hlsli"
#include "../Common/VR.hlsli"
#include "common.hlsli"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "../Common/Color.hlsl"
#include "../Common/FrameBuffer.hlsl"
#include "../Common/Color.hlsli"
#include "../Common/FrameBuffer.hlsli"
#include "../Common/GBuffer.hlsli"
#include "../Common/VR.hlsli"
#include "common.hlsli"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Skylighting.hlsli"

#include "../Common/DeferredShared.hlsli"
#include "../Common/FrameBuffer.hlsl"
#include "../Common/FrameBuffer.hlsli"
#include "../Common/Spherical Harmonics/SphericalHarmonics.hlsli"

cbuffer SkylightingCB : register(b1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cbuffer PerFrameSSS : register(b1)
float SSSS_FOVY;
};

#include "../Common/Color.hlsl"
#include "../Common/Color.hlsli"
#include "../Common/Constants.hlsli"
#include "../Common/DeferredShared.hlsli"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "WetnessEffects/optimized-ggx.hlsl"
#include "WetnessEffects/optimized-ggx.hlsli"

// https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
float2 EnvBRDFApproxWater(float3 F0, float Roughness, float NoV)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
optimized-ggx.hlsl
optimized-ggx.hlsli
This file describes several optimizations you can make when creating a GGX shader.
AUTHOR: John Hable
Expand Down
4 changes: 2 additions & 2 deletions package/Shaders/AmbientCompositeCS.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Common/Color.hlsl"
#include "Common/Color.hlsli"
#include "Common/DeferredShared.hlsli"
#include "Common/FrameBuffer.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/GBuffer.hlsli"
#include "Common/VR.hlsli"

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions package/Shaders/DeferredCompositeCS.hlsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include "Common/Color.hlsl"
#include "Common/Color.hlsli"
#include "Common/DeferredShared.hlsli"
#include "Common/FrameBuffer.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/GBuffer.hlsli"
#include "Common/VR.hlsli"

Expand Down
4 changes: 2 additions & 2 deletions package/Shaders/DistantTree.hlsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Common/Constants.hlsli"
#include "Common/FrameBuffer.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/GBuffer.hlsli"
#include "Common/MotionBlur.hlsl"
#include "Common/MotionBlur.hlsli"
#include "Common/SharedData.hlsli"
#include "Common/VR.hlsli"

Expand Down
8 changes: 4 additions & 4 deletions package/Shaders/Effect.hlsl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "Common/Color.hlsl"
#include "Common/FrameBuffer.hlsl"
#include "Common/Color.hlsli"
#include "Common/FrameBuffer.hlsli"
#include "Common/GBuffer.hlsli"
#include "Common/MotionBlur.hlsl"
#include "Common/Permutation.hlsl"
#include "Common/MotionBlur.hlsli"
#include "Common/Permutation.hlsli"
#include "Common/SharedData.hlsli"
#include "Common/Skinned.hlsli"
#include "Common/VR.hlsli"
Expand Down
8 changes: 4 additions & 4 deletions package/Shaders/Lighting.hlsl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "Common/Color.hlsl"
#include "Common/FrameBuffer.hlsl"
#include "Common/Color.hlsli"
#include "Common/FrameBuffer.hlsli"
#include "Common/GBuffer.hlsli"
#include "Common/LodLandscape.hlsli"
#include "Common/MotionBlur.hlsl"
#include "Common/Permutation.hlsl"
#include "Common/MotionBlur.hlsli"
#include "Common/Permutation.hlsli"
#include "Common/SharedData.hlsli"
#include "Common/Skinned.hlsli"

Expand Down
2 changes: 1 addition & 1 deletion package/Shaders/Particle.hlsl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Common/Constants.hlsli"
#include "Common/FrameBuffer.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/VR.hlsli"

struct VS_INPUT
Expand Down
8 changes: 4 additions & 4 deletions package/Shaders/RunGrass.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,11 @@ struct PS_OUTPUT

#ifdef PSHADER

# include "Common/Color.hlsl"
# include "Common/FrameBuffer.hlsl"
# include "Common/Color.hlsli"
# include "Common/FrameBuffer.hlsli"
# include "Common/SharedData.hlsli"
# include "Common/MotionBlur.hlsl"
# include "Common/Permutation.hlsl"
# include "Common/MotionBlur.hlsli"
# include "Common/Permutation.hlsli"

SamplerState SampBaseSampler : register(s0);
SamplerState SampShadowMaskSampler : register(s1);
Expand Down
4 changes: 2 additions & 2 deletions package/Shaders/Sky.hlsl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Common/Constants.hlsli"
#include "Common/FrameBuffer.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/VR.hlsli"

struct VS_INPUT
Expand Down Expand Up @@ -181,7 +181,7 @@ cbuffer AlphaTestRefCB : register(b11)
}
# endif

# include "Common/MotionBlur.hlsl"
# include "Common/MotionBlur.hlsli"
# include "Common/SharedData.hlsli"

# if defined(CLOUD_SHADOWS)
Expand Down
2 changes: 1 addition & 1 deletion package/Shaders/Utility.hlsl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Common/Constants.hlsli"
#include "Common/FrameBuffer.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/LodLandscape.hlsli"
#include "Common/SharedData.hlsli"
#include "Common/Skinned.hlsli"
Expand Down
6 changes: 3 additions & 3 deletions package/Shaders/Water.hlsl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Common/FrameBuffer.hlsl"
#include "Common/MotionBlur.hlsl"
#include "Common/Permutation.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/MotionBlur.hlsli"
#include "Common/Permutation.hlsli"

#define WATER

Expand Down

0 comments on commit 2a1cd44

Please sign in to comment.