From 306d8bf64aff5fa1b7b587ba9d0c5014fa1227fe Mon Sep 17 00:00:00 2001 From: REDDRAGON Date: Thu, 13 Sep 2018 15:36:55 +0200 Subject: [PATCH] Removed support for unstable V_Ward/G_Ward --- MAGE/Rendering/src/renderer/configuration.hpp | 8 +- .../shader/shader_factory_deferred.cpp | 26 -- .../shader/shader_factory_forward.cpp | 66 ----- MAGE/Scripts/src/editor_script.cpp | 6 +- MAGE/Shaders.vcxproj | 228 ------------------ MAGE/Shaders.vcxproj.filters | 72 ------ .../deferred_msaa_vct_ward_duer_PS.hlsl | 6 - .../deferred/deferred_msaa_ward_duer_PS.hlsl | 7 - .../deferred/deferred_vct_ward_duer_CS.hlsl | 5 - .../deferred/deferred_ward_duer_CS.hlsl | 6 - ...forward_transparent_tsnm_ward_duer_PS.hlsl | 7 - ...ard_transparent_vct_tsnm_ward_duer_PS.hlsl | 6 - .../forward_transparent_vct_ward_duer_PS.hlsl | 7 - .../forward_transparent_ward_duer_PS.hlsl | 8 - .../forward/forward_tsnm_ward_duer_PS.hlsl | 6 - .../forward_vct_tsnm_ward_duer_PS.hlsl | 5 - .../forward/forward_vct_ward_duer_PS.hlsl | 6 - .../shaders/forward/forward_ward_duer_PS.hlsl | 7 - 18 files changed, 5 insertions(+), 477 deletions(-) delete mode 100644 MAGE/Shaders/shaders/deferred/deferred_msaa_vct_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/deferred/deferred_msaa_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/deferred/deferred_vct_ward_duer_CS.hlsl delete mode 100644 MAGE/Shaders/shaders/deferred/deferred_ward_duer_CS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_transparent_tsnm_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_transparent_vct_tsnm_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_transparent_vct_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_transparent_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_tsnm_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_vct_tsnm_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_vct_ward_duer_PS.hlsl delete mode 100644 MAGE/Shaders/shaders/forward/forward_ward_duer_PS.hlsl diff --git a/MAGE/Rendering/src/renderer/configuration.hpp b/MAGE/Rendering/src/renderer/configuration.hpp index 7a2195f9b..671797710 100644 --- a/MAGE/Rendering/src/renderer/configuration.hpp +++ b/MAGE/Rendering/src/renderer/configuration.hpp @@ -191,16 +191,14 @@ namespace mage::rendering { This contains: @c Lambertian, @c BlinnPhong, - @c CookTorrance, - @c Frostbite, and - @c WardDuer. + @c CookTorrance, and + @c Frostbite. */ enum class BRDF : U8 { Lambertian = 0, BlinnPhong, CookTorrance, - Frostbite, - WardDuer + Frostbite }; #pragma endregion diff --git a/MAGE/Rendering/src/resource/shader/shader_factory_deferred.cpp b/MAGE/Rendering/src/resource/shader/shader_factory_deferred.cpp index f00c7ff11..347fa82a1 100644 --- a/MAGE/Rendering/src/resource/shader/shader_factory_deferred.cpp +++ b/MAGE/Rendering/src/resource/shader/shader_factory_deferred.cpp @@ -12,26 +12,22 @@ #include "deferred\deferred_emissive_CS.hpp" #include "deferred\deferred_frostbite_CS.hpp" #include "deferred\deferred_lambertian_CS.hpp" -#include "deferred\deferred_ward_duer_CS.hpp" // Deferred: Opaque + VCT #include "deferred\deferred_vct_blinn_phong_CS.hpp" #include "deferred\deferred_vct_cook_torrance_CS.hpp" #include "deferred\deferred_vct_frostbite_CS.hpp" #include "deferred\deferred_vct_lambertian_CS.hpp" -#include "deferred\deferred_vct_ward_duer_CS.hpp" // Deferred MSAA: Opaque #include "deferred\deferred_msaa_blinn_phong_PS.hpp" #include "deferred\deferred_msaa_cook_torrance_PS.hpp" #include "deferred\deferred_msaa_emissive_PS.hpp" #include "deferred\deferred_msaa_frostbite_PS.hpp" #include "deferred\deferred_msaa_lambertian_PS.hpp" -#include "deferred\deferred_msaa_ward_duer_PS.hpp" // Deferred MSAA: Opaque + VCT #include "deferred\deferred_msaa_vct_blinn_phong_PS.hpp" #include "deferred\deferred_msaa_vct_cook_torrance_PS.hpp" #include "deferred\deferred_msaa_vct_frostbite_PS.hpp" #include "deferred\deferred_msaa_vct_lambertian_PS.hpp" -#include "deferred\deferred_msaa_vct_ward_duer_PS.hpp" #pragma endregion @@ -98,15 +94,6 @@ namespace mage::rendering { : CreateCS(resource_manager, MAGE_SHADER_ARGS(g_deferred_lambertian_CS)); } - - ComputeShaderPtr CreateDeferredWardDuerCS(ResourceManager& resource_manager, - bool vct) { - - return vct ? CreateCS(resource_manager, - MAGE_SHADER_ARGS(g_deferred_vct_ward_duer_CS)) - : CreateCS(resource_manager, - MAGE_SHADER_ARGS(g_deferred_ward_duer_CS)); - } } ComputeShaderPtr CreateDeferredCS(ResourceManager& resource_manager, @@ -121,8 +108,6 @@ namespace mage::rendering { return CreateDeferredCookTorranceCS(resource_manager, vct); case BRDF::Frostbite: return CreateDeferredFrostbiteCS(resource_manager, vct); - case BRDF::WardDuer: - return CreateDeferredWardDuerCS(resource_manager, vct); default: return nullptr; } @@ -178,15 +163,6 @@ namespace mage::rendering { : CreatePS(resource_manager, MAGE_SHADER_ARGS(g_deferred_msaa_lambertian_PS)); } - - PixelShaderPtr CreateDeferredMSAAWardDuerPS(ResourceManager& resource_manager, - bool vct) { - - return vct ? CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_deferred_msaa_vct_ward_duer_PS)) - : CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_deferred_msaa_ward_duer_PS)); - } } PixelShaderPtr CreateDeferredMSAAPS(ResourceManager& resource_manager, @@ -201,8 +177,6 @@ namespace mage::rendering { return CreateDeferredMSAACookTorrancePS(resource_manager, vct); case BRDF::Frostbite: return CreateDeferredMSAAFrostbitePS(resource_manager, vct); - case BRDF::WardDuer: - return CreateDeferredMSAAWardDuerPS(resource_manager, vct); default: return nullptr; } diff --git a/MAGE/Rendering/src/resource/shader/shader_factory_forward.cpp b/MAGE/Rendering/src/resource/shader/shader_factory_forward.cpp index bf4463115..1060df8b6 100644 --- a/MAGE/Rendering/src/resource/shader/shader_factory_forward.cpp +++ b/MAGE/Rendering/src/resource/shader/shader_factory_forward.cpp @@ -13,50 +13,42 @@ #include "forward\forward_emissive_PS.hpp" #include "forward\forward_frostbite_PS.hpp" #include "forward\forward_lambertian_PS.hpp" -#include "forward\forward_ward_duer_PS.hpp" // Forward: Opaque + VCT #include "forward\forward_vct_blinn_phong_PS.hpp" #include "forward\forward_vct_cook_torrance_PS.hpp" #include "forward\forward_vct_frostbite_PS.hpp" #include "forward\forward_vct_lambertian_PS.hpp" -#include "forward\forward_vct_ward_duer_PS.hpp" // Forward: Opaque + TSNM #include "forward\forward_tsnm_blinn_phong_PS.hpp" #include "forward\forward_tsnm_cook_torrance_PS.hpp" #include "forward\forward_tsnm_frostbite_PS.hpp" #include "forward\forward_tsnm_lambertian_PS.hpp" -#include "forward\forward_tsnm_ward_duer_PS.hpp" // Forward: Opaque + VCT + TSNM #include "forward\forward_vct_tsnm_blinn_phong_PS.hpp" #include "forward\forward_vct_tsnm_cook_torrance_PS.hpp" #include "forward\forward_vct_tsnm_frostbite_PS.hpp" #include "forward\forward_vct_tsnm_lambertian_PS.hpp" -#include "forward\forward_vct_tsnm_ward_duer_PS.hpp" // Forward: Transparent #include "forward\forward_transparent_blinn_phong_PS.hpp" #include "forward\forward_transparent_cook_torrance_PS.hpp" #include "forward\forward_transparent_emissive_PS.hpp" #include "forward\forward_transparent_frostbite_PS.hpp" #include "forward\forward_transparent_lambertian_PS.hpp" -#include "forward\forward_transparent_ward_duer_PS.hpp" // Forward: Transparent + VCT #include "forward\forward_transparent_vct_blinn_phong_PS.hpp" #include "forward\forward_transparent_vct_cook_torrance_PS.hpp" #include "forward\forward_transparent_vct_frostbite_PS.hpp" #include "forward\forward_transparent_vct_lambertian_PS.hpp" -#include "forward\forward_transparent_vct_ward_duer_PS.hpp" // Forward: Transparent + TSNM #include "forward\forward_transparent_tsnm_blinn_phong_PS.hpp" #include "forward\forward_transparent_tsnm_cook_torrance_PS.hpp" #include "forward\forward_transparent_tsnm_frostbite_PS.hpp" #include "forward\forward_transparent_tsnm_lambertian_PS.hpp" -#include "forward\forward_transparent_tsnm_ward_duer_PS.hpp" // Forward: Transparent + VCT + TSNM #include "forward\forward_transparent_vct_tsnm_blinn_phong_PS.hpp" #include "forward\forward_transparent_vct_tsnm_cook_torrance_PS.hpp" #include "forward\forward_transparent_vct_tsnm_frostbite_PS.hpp" #include "forward\forward_transparent_vct_tsnm_lambertian_PS.hpp" -#include "forward\forward_transparent_vct_tsnm_ward_duer_PS.hpp" #pragma endregion @@ -340,62 +332,6 @@ namespace mage::rendering { return nullptr; } } - - /** - Creates a forward pixel shader with a Ward-Duer BRDF. - - @param[in] resource_manager - A reference to the resource manager. - @param[in] transparency - @c true if transparency should be enabled. @c false - otherwise. - @param[in] vct - @c true if voxel cone tracing should be enabled. @c - false otherwise. - @param[in] tsnm - @c true if tangent space normal mapping should be - enabled. @c false otherwise. - @return A pointer to the forward pixel shader with a Ward-Duer - BRDF. - @throws Exception - Failed to create the pixel shader. - */ - PixelShaderPtr CreateForwardWardDuerPS(ResourceManager& resource_manager, - bool transparency, - bool vct, - bool tsnm) { - - const auto mask = GetPermutationMask(transparency, vct, tsnm); - switch (mask) { - - case 0b000: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_ward_duer_PS)); - case 0b001: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_tsnm_ward_duer_PS)); - case 0b010: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_vct_ward_duer_PS)); - case 0b011: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_vct_tsnm_ward_duer_PS)); - case 0b100: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_transparent_ward_duer_PS)); - case 0b101: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_transparent_tsnm_ward_duer_PS)); - case 0b110: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_transparent_vct_ward_duer_PS)); - case 0b111: - return CreatePS(resource_manager, - MAGE_SHADER_ARGS(g_forward_transparent_vct_tsnm_ward_duer_PS)); - default: - return nullptr; - } - } } PixelShaderPtr CreateForwardPS(ResourceManager& resource_manager, @@ -414,8 +350,6 @@ namespace mage::rendering { return CreateForwardCookTorrancePS(resource_manager, transparency, vct, tsnm); case BRDF::Frostbite: return CreateForwardFrostbitePS(resource_manager, transparency, vct, tsnm); - case BRDF::WardDuer: - return CreateForwardWardDuerPS(resource_manager, transparency, vct, tsnm); default: return nullptr; } diff --git a/MAGE/Scripts/src/editor_script.cpp b/MAGE/Scripts/src/editor_script.cpp index 7cbfea3b4..9b8c67dfc 100644 --- a/MAGE/Scripts/src/editor_script.cpp +++ b/MAGE/Scripts/src/editor_script.cpp @@ -201,15 +201,13 @@ namespace mage::script { "Lambertian", "Blinn-Phong", "Cook-Torrance", - "Frostbite", - "Ward-Duer" + "Frostbite" }; static constexpr BRDF brdfs[] = { BRDF::Lambertian, BRDF::BlinnPhong, BRDF::CookTorrance, - BRDF::Frostbite, - BRDF::WardDuer + BRDF::Frostbite }; static_assert(std::size(brdf_names) == std::size(brdfs)); diff --git a/MAGE/Shaders.vcxproj b/MAGE/Shaders.vcxproj index ce3923153..20fead55d 100644 --- a/MAGE/Shaders.vcxproj +++ b/MAGE/Shaders.vcxproj @@ -169,20 +169,6 @@ PS Pixel - - $(ProjectName)\src\deferred\%(Filename).hpp - $(ProjectName)\src\deferred\%(Filename).hpp - $(ProjectName)\src\deferred\%(Filename).hpp - $(ProjectName)\src\deferred\%(Filename).hpp - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\deferred\%(Filename).hpp $(ProjectName)\src\deferred\%(Filename).hpp @@ -239,20 +225,6 @@ CS Compute - - $(ProjectName)\src\deferred\%(Filename).hpp - $(ProjectName)\src\deferred\%(Filename).hpp - $(ProjectName)\src\deferred\%(Filename).hpp - $(ProjectName)\src\deferred\%(Filename).hpp - CS - Compute - CS - Compute - CS - Compute - CS - Compute - CS Compute @@ -576,34 +548,6 @@ $(ProjectName)\src\forward\%(Filename).hpp $(ProjectName)\src\forward\%(Filename).hpp - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - PS Pixel @@ -716,34 +660,6 @@ $(ProjectName)\src\forward\%(Filename).hpp $(ProjectName)\src\forward\%(Filename).hpp - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - $(ProjectName)\src\forward\%(Filename).hpp - PS Pixel @@ -1373,50 +1289,6 @@ $(ProjectName)\src\deferred\%(Filename).hpp $(ProjectName)\src\deferred\%(Filename).hpp - - $(ProjectName)\src\deferred\%(Filename).hpp - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - CS - Compute - CS - Compute - CS - Compute - CS - Compute - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - $(ProjectName)\src\deferred\%(Filename).hpp - - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - PS Pixel @@ -1703,50 +1575,6 @@ - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - PS Pixel @@ -1791,50 +1619,6 @@ - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - - - PS - Pixel - PS - Pixel - PS - Pixel - PS - Pixel - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - $(ProjectName)\src\forward\%(Filename).hpp - - - PS Pixel @@ -2206,14 +1990,10 @@ - - - - @@ -2251,7 +2031,6 @@ - @@ -2260,14 +2039,10 @@ - - - - @@ -2276,9 +2051,6 @@ - - - diff --git a/MAGE/Shaders.vcxproj.filters b/MAGE/Shaders.vcxproj.filters index f57db6a4f..60896b8f0 100644 --- a/MAGE/Shaders.vcxproj.filters +++ b/MAGE/Shaders.vcxproj.filters @@ -130,9 +130,6 @@ Shader Files\deferred - - Shader Files\deferred - Shader Files\deferred @@ -145,9 +142,6 @@ Shader Files\deferred - - Shader Files\deferred - Shader Files\deferred @@ -160,12 +154,6 @@ Shader Files\deferred - - Shader Files\deferred - - - Shader Files\deferred - Shader Files\depth @@ -277,9 +265,6 @@ Shader Files\forward - - Shader Files\forward - Shader Files\forward @@ -304,15 +289,6 @@ Shader Files\forward - - Shader Files\forward - - - Shader Files\forward - - - Shader Files\forward - Shader Files\forward @@ -325,9 +301,6 @@ Shader Files\forward - - Shader Files\forward - Shader Files\forward @@ -352,15 +325,6 @@ Shader Files\forward - - Shader Files\forward - - - Shader Files\forward - - - Shader Files\forward - Shader Files\gbuffer @@ -599,9 +563,6 @@ Header Files\deferred - - Header Files\deferred - Header Files\deferred @@ -614,9 +575,6 @@ Header Files\deferred - - Header Files\deferred - Header Files\deferred @@ -629,12 +587,6 @@ Header Files\deferred - - Header Files\deferred - - - Header Files\deferred - Header Files\depth @@ -746,9 +698,6 @@ Header Files\forward - - Header Files\forward - Header Files\forward @@ -773,15 +722,6 @@ Header Files\forward - - Header Files\forward - - - Header Files\forward - - - Header Files\forward - Header Files\forward @@ -794,9 +734,6 @@ Header Files\forward - - Header Files\forward - Header Files\forward @@ -821,15 +758,6 @@ Header Files\forward - - Header Files\forward - - - Header Files\forward - - - Header Files\forward - Header Files\gbuffer diff --git a/MAGE/Shaders/shaders/deferred/deferred_msaa_vct_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/deferred/deferred_msaa_vct_ward_duer_PS.hlsl deleted file mode 100644 index c3b2f0d57..000000000 --- a/MAGE/Shaders/shaders/deferred/deferred_msaa_vct_ward_duer_PS.hlsl +++ /dev/null @@ -1,6 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define MSAA -#include "deferred\deferred.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/deferred/deferred_msaa_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/deferred/deferred_msaa_ward_duer_PS.hlsl deleted file mode 100644 index 785eb5ad6..000000000 --- a/MAGE/Shaders/shaders/deferred/deferred_msaa_ward_duer_PS.hlsl +++ /dev/null @@ -1,7 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_VCT -#define MSAA -#include "deferred\deferred.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/deferred/deferred_vct_ward_duer_CS.hlsl b/MAGE/Shaders/shaders/deferred/deferred_vct_ward_duer_CS.hlsl deleted file mode 100644 index 1be4cc4df..000000000 --- a/MAGE/Shaders/shaders/deferred/deferred_vct_ward_duer_CS.hlsl +++ /dev/null @@ -1,5 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#include "deferred\deferred.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/deferred/deferred_ward_duer_CS.hlsl b/MAGE/Shaders/shaders/deferred/deferred_ward_duer_CS.hlsl deleted file mode 100644 index 558bc1bf5..000000000 --- a/MAGE/Shaders/shaders/deferred/deferred_ward_duer_CS.hlsl +++ /dev/null @@ -1,6 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_VCT -#include "deferred\deferred.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_transparent_tsnm_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_transparent_tsnm_ward_duer_PS.hlsl deleted file mode 100644 index 5e0c4845c..000000000 --- a/MAGE/Shaders/shaders/forward/forward_transparent_tsnm_ward_duer_PS.hlsl +++ /dev/null @@ -1,7 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_VCT -#define ENABLE_TRANSPARENCY -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_transparent_vct_tsnm_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_transparent_vct_tsnm_ward_duer_PS.hlsl deleted file mode 100644 index 5e26a3f17..000000000 --- a/MAGE/Shaders/shaders/forward/forward_transparent_vct_tsnm_ward_duer_PS.hlsl +++ /dev/null @@ -1,6 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define ENABLE_TRANSPARENCY -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_transparent_vct_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_transparent_vct_ward_duer_PS.hlsl deleted file mode 100644 index 4401ee21d..000000000 --- a/MAGE/Shaders/shaders/forward/forward_transparent_vct_ward_duer_PS.hlsl +++ /dev/null @@ -1,7 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_TSNM -#define ENABLE_TRANSPARENCY -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_transparent_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_transparent_ward_duer_PS.hlsl deleted file mode 100644 index 216f5ffc9..000000000 --- a/MAGE/Shaders/shaders/forward/forward_transparent_ward_duer_PS.hlsl +++ /dev/null @@ -1,8 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_TSNM -#define DISABLE_VCT -#define ENABLE_TRANSPARENCY -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_tsnm_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_tsnm_ward_duer_PS.hlsl deleted file mode 100644 index 5cb2de023..000000000 --- a/MAGE/Shaders/shaders/forward/forward_tsnm_ward_duer_PS.hlsl +++ /dev/null @@ -1,6 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_VCT -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_vct_tsnm_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_vct_tsnm_ward_duer_PS.hlsl deleted file mode 100644 index 3d10f8c52..000000000 --- a/MAGE/Shaders/shaders/forward/forward_vct_tsnm_ward_duer_PS.hlsl +++ /dev/null @@ -1,5 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_vct_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_vct_ward_duer_PS.hlsl deleted file mode 100644 index d9c2b30e0..000000000 --- a/MAGE/Shaders/shaders/forward/forward_vct_ward_duer_PS.hlsl +++ /dev/null @@ -1,6 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_TSNM -#include "forward\forward.hlsli" \ No newline at end of file diff --git a/MAGE/Shaders/shaders/forward/forward_ward_duer_PS.hlsl b/MAGE/Shaders/shaders/forward/forward_ward_duer_PS.hlsl deleted file mode 100644 index ec1a3bfab..000000000 --- a/MAGE/Shaders/shaders/forward/forward_ward_duer_PS.hlsl +++ /dev/null @@ -1,7 +0,0 @@ -//----------------------------------------------------------------------------- -// Engine Includes -//----------------------------------------------------------------------------- -#define BRDF_WARD_DUER -#define DISABLE_TSNM -#define DISABLE_VCT -#include "forward\forward.hlsli" \ No newline at end of file