diff --git a/blurs/shaders/dual_filter/bloom_blend.slang b/blurs/shaders/dual_filter/bloom_blend.slang index 17ae0a06..aa1458dc 100644 --- a/blurs/shaders/dual_filter/bloom_blend.slang +++ b/blurs/shaders/dual_filter/bloom_blend.slang @@ -1,11 +1,11 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "dual_filter.slang" -#include "parameters.slang" -#include "parameters_bloom.slang" -#include "tonemapping.slang" +#include "dual_filter.inc" +#include "parameters.inc" +#include "parameters_bloom.inc" +#include "tonemapping.inc" #pragma parameter SCALE_EMPH "Bloom scale emphasis" 1.0 0.0 5.0 0.1 #pragma parameter SCALE_SPREAD "Bloom scale spread" 5.0 0.5 15.0 0.5 diff --git a/blurs/shaders/dual_filter/bloom_blend_fast.slang b/blurs/shaders/dual_filter/bloom_blend_fast.slang index ebb1a6c6..72fccebc 100644 --- a/blurs/shaders/dual_filter/bloom_blend_fast.slang +++ b/blurs/shaders/dual_filter/bloom_blend_fast.slang @@ -1,11 +1,11 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "dual_filter.slang" -#include "parameters.slang" -#include "parameters_bloom.slang" -#include "tonemapping.slang" +#include "dual_filter.inc" +#include "parameters.inc" +#include "parameters_bloom.inc" +#include "tonemapping.inc" #pragma parameter SCALE_EMPH "Bloom scale emphasis" 0.0 0.0 3.0 0.1 #pragma parameter SCALE_SPREAD "Bloom scale spread" 4.0 0.5 10.0 0.5 diff --git a/blurs/shaders/dual_filter/bloom_blend_fastest.slang b/blurs/shaders/dual_filter/bloom_blend_fastest.slang index 15d33972..9ab856c1 100644 --- a/blurs/shaders/dual_filter/bloom_blend_fastest.slang +++ b/blurs/shaders/dual_filter/bloom_blend_fastest.slang @@ -1,11 +1,11 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "dual_filter.slang" -#include "parameters.slang" -#include "parameters_bloom.slang" -#include "tonemapping.slang" +#include "dual_filter.inc" +#include "parameters.inc" +#include "parameters_bloom.inc" +#include "tonemapping.inc" layout(push_constant) uniform Push { vec4 InputSize; diff --git a/blurs/shaders/dual_filter/downsample.slang b/blurs/shaders/dual_filter/downsample.slang index 2f6365af..e705f8c4 100644 --- a/blurs/shaders/dual_filter/downsample.slang +++ b/blurs/shaders/dual_filter/downsample.slang @@ -1,9 +1,9 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "dual_filter.slang" -#include "parameters.slang" +#include "dual_filter.inc" +#include "parameters.inc" layout(push_constant) uniform Push { vec4 SourceSize; diff --git a/blurs/shaders/dual_filter/downsample_bloom.slang b/blurs/shaders/dual_filter/downsample_bloom.slang index 759041b4..d320b805 100644 --- a/blurs/shaders/dual_filter/downsample_bloom.slang +++ b/blurs/shaders/dual_filter/downsample_bloom.slang @@ -1,10 +1,10 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "dual_filter.slang" -#include "parameters.slang" -#include "parameters_bloom.slang" +#include "dual_filter.inc" +#include "parameters.inc" +#include "parameters_bloom.inc" layout(push_constant) uniform Push { vec4 SourceSize; diff --git a/blurs/shaders/dual_filter/dual_filter.slang b/blurs/shaders/dual_filter/dual_filter.inc similarity index 100% rename from blurs/shaders/dual_filter/dual_filter.slang rename to blurs/shaders/dual_filter/dual_filter.inc diff --git a/blurs/shaders/dual_filter/moving_avg.slang b/blurs/shaders/dual_filter/moving_avg.slang index 7d1c4ac0..4abbca8d 100644 --- a/blurs/shaders/dual_filter/moving_avg.slang +++ b/blurs/shaders/dual_filter/moving_avg.slang @@ -1,9 +1,9 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "parameters.slang" -#include "parameters_bloom.slang" +#include "parameters.inc" +#include "parameters_bloom.inc" layout(push_constant) uniform Push { vec4 SourceSize; diff --git a/blurs/shaders/dual_filter/parameters.slang b/blurs/shaders/dual_filter/parameters.inc similarity index 76% rename from blurs/shaders/dual_filter/parameters.slang rename to blurs/shaders/dual_filter/parameters.inc index 1f50b9f0..32505814 100644 --- a/blurs/shaders/dual_filter/parameters.slang +++ b/blurs/shaders/dual_filter/parameters.inc @@ -1,4 +1,4 @@ -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. // clang-format off #pragma parameter DUAL_FILTER_SETTINGS "=== Dual Filter Blur & Bloom v1.1 settings ===" 0.0 0.0 1.0 1.0 diff --git a/blurs/shaders/dual_filter/parameters_bloom.slang b/blurs/shaders/dual_filter/parameters_bloom.inc similarity index 100% rename from blurs/shaders/dual_filter/parameters_bloom.slang rename to blurs/shaders/dual_filter/parameters_bloom.inc diff --git a/blurs/shaders/dual_filter/tonemapping.slang b/blurs/shaders/dual_filter/tonemapping.inc similarity index 96% rename from blurs/shaders/dual_filter/tonemapping.slang rename to blurs/shaders/dual_filter/tonemapping.inc index fd2e3e60..63f1627b 100644 --- a/blurs/shaders/dual_filter/tonemapping.slang +++ b/blurs/shaders/dual_filter/tonemapping.inc @@ -1,4 +1,4 @@ -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. // Tonemapping following // http://filmicworlds.com/blog/filmic-tonemapping-with-piecewise-power-curves/ diff --git a/blurs/shaders/dual_filter/upsample.slang b/blurs/shaders/dual_filter/upsample.slang index 98b87eeb..68576c5d 100644 --- a/blurs/shaders/dual_filter/upsample.slang +++ b/blurs/shaders/dual_filter/upsample.slang @@ -1,9 +1,9 @@ #version 450 -// See dual_filter.slang for copyright and other information. +// See dual_filter.inc for copyright and other information. -#include "dual_filter.slang" -#include "parameters.slang" +#include "dual_filter.inc" +#include "parameters.inc" layout(push_constant) uniform Push { vec4 SourceSize; diff --git a/blurs/shaders/gauss_4tap/common.slang b/blurs/shaders/gauss_4tap/common.inc similarity index 100% rename from blurs/shaders/gauss_4tap/common.slang rename to blurs/shaders/gauss_4tap/common.inc diff --git a/blurs/shaders/gauss_4tap/gauss_2tap_h.slang b/blurs/shaders/gauss_4tap/gauss_2tap_h.slang index c05fd2ee..cf307456 100644 --- a/blurs/shaders/gauss_4tap/gauss_2tap_h.slang +++ b/blurs/shaders/gauss_4tap/gauss_2tap_h.slang @@ -1,8 +1,8 @@ #version 450 -// See common.slang for copyright and other information. +// See common.inc for copyright and other information. -#include "parameters.slang" +#include "parameters.inc" layout(push_constant) uniform Push { vec4 SourceSize; @@ -10,7 +10,7 @@ layout(push_constant) uniform Push { } param; -#include "common.slang" +#include "common.inc" layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; } global; diff --git a/blurs/shaders/gauss_4tap/gauss_2tap_v.slang b/blurs/shaders/gauss_4tap/gauss_2tap_v.slang index 7a8e2570..d96e4cf3 100644 --- a/blurs/shaders/gauss_4tap/gauss_2tap_v.slang +++ b/blurs/shaders/gauss_4tap/gauss_2tap_v.slang @@ -1,8 +1,8 @@ #version 450 -// See common.slang for copyright and other information. +// See common.inc for copyright and other information. -#include "parameters.slang" +#include "parameters.inc" layout(push_constant) uniform Push { vec4 SourceSize; @@ -10,7 +10,7 @@ layout(push_constant) uniform Push { } param; -#include "common.slang" +#include "common.inc" layout(std140, set = 0, binding = 0) uniform UBO { mat4 MVP; } global; diff --git a/blurs/shaders/gauss_4tap/parameters.slang b/blurs/shaders/gauss_4tap/parameters.inc similarity index 77% rename from blurs/shaders/gauss_4tap/parameters.slang rename to blurs/shaders/gauss_4tap/parameters.inc index d00c92dc..c8d99073 100644 --- a/blurs/shaders/gauss_4tap/parameters.slang +++ b/blurs/shaders/gauss_4tap/parameters.inc @@ -1,4 +1,4 @@ -// See common.slang for copyright and other information. +// See common.inc for copyright and other information. // clang-format off #pragma parameter GAUSS_4TAP_SETTINGS "=== Gauss-4tap v1.0 settings ===" 0.0 0.0 1.0 1.0 diff --git a/border/shaders/average_fill/compose.slang b/border/shaders/average_fill/compose.slang index f28a8e57..6dffe1a2 100644 --- a/border/shaders/average_fill/compose.slang +++ b/border/shaders/average_fill/compose.slang @@ -39,12 +39,12 @@ */ // clang-format off -#include "parameters.slang" -#include "../../../pixel-art-scaling/shaders/pixel_aa/parameters.slang" +#include "parameters.inc" +#include "../../../pixel-art-scaling/shaders/pixel_aa/parameters.inc" // clang-format on -#include "../../../misc/shaders/input_transform/input_transform.slang" -#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.slang" +#include "../../../misc/shaders/input_transform/input_transform.inc" +#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.inc" layout(push_constant) uniform Push { vec4 InputSize; diff --git a/border/shaders/average_fill/crop_and_sample_bottom.slang b/border/shaders/average_fill/crop_and_sample_bottom.slang index caab0a46..f642a441 100644 --- a/border/shaders/average_fill/crop_and_sample_bottom.slang +++ b/border/shaders/average_fill/crop_and_sample_bottom.slang @@ -10,4 +10,4 @@ vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) { input_size.y - crop.z); } -#include "crop_and_sample_common.slang" +#include "crop_and_sample_common.inc" diff --git a/border/shaders/average_fill/crop_and_sample_common.slang b/border/shaders/average_fill/crop_and_sample_common.inc similarity index 97% rename from border/shaders/average_fill/crop_and_sample_common.slang rename to border/shaders/average_fill/crop_and_sample_common.inc index 4bbd9792..6dc941e1 100644 --- a/border/shaders/average_fill/crop_and_sample_common.slang +++ b/border/shaders/average_fill/crop_and_sample_common.inc @@ -1,7 +1,7 @@ // See compose.slang for copyright and other information. -#include "../../../misc/shaders/input_transform/input_transform.slang" -#include "parameters.slang" +#include "../../../misc/shaders/input_transform/input_transform.inc" +#include "parameters.inc" layout(push_constant) uniform Push { vec4 InputSize; diff --git a/border/shaders/average_fill/crop_and_sample_left.slang b/border/shaders/average_fill/crop_and_sample_left.slang index 151013c9..f763dd2e 100644 --- a/border/shaders/average_fill/crop_and_sample_left.slang +++ b/border/shaders/average_fill/crop_and_sample_left.slang @@ -9,4 +9,4 @@ vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) { input_size.y - crop.z); } -#include "crop_and_sample_common.slang" +#include "crop_and_sample_common.inc" diff --git a/border/shaders/average_fill/crop_and_sample_right.slang b/border/shaders/average_fill/crop_and_sample_right.slang index ef7792c3..bbece6d0 100644 --- a/border/shaders/average_fill/crop_and_sample_right.slang +++ b/border/shaders/average_fill/crop_and_sample_right.slang @@ -9,4 +9,4 @@ vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) { input_size.y - crop.z); } -#include "crop_and_sample_common.slang" +#include "crop_and_sample_common.inc" diff --git a/border/shaders/average_fill/crop_and_sample_top.slang b/border/shaders/average_fill/crop_and_sample_top.slang index c393d446..baa4210e 100644 --- a/border/shaders/average_fill/crop_and_sample_top.slang +++ b/border/shaders/average_fill/crop_and_sample_top.slang @@ -9,4 +9,4 @@ vec4 get_effective_corners(vec4 crop, vec4 input_size, float sample_size) { crop.x + sample_size); } -#include "crop_and_sample_common.slang" +#include "crop_and_sample_common.inc" diff --git a/border/shaders/average_fill/parameters.slang b/border/shaders/average_fill/parameters.inc similarity index 90% rename from border/shaders/average_fill/parameters.slang rename to border/shaders/average_fill/parameters.inc index 7dcbb1e8..cc1878ca 100644 --- a/border/shaders/average_fill/parameters.slang +++ b/border/shaders/average_fill/parameters.inc @@ -3,7 +3,7 @@ // clang-format off #pragma parameter AVERAGE_FILL_SETTINGS "=== Average fill v1.8 settings ===" 0.0 0.0 1.0 1.0 -#include "../../../misc/shaders/input_transform/parameters.slang" +#include "../../../misc/shaders/input_transform/parameters.inc" #pragma parameter OTHER_SETTINGS "= Other parameters =" 0.0 0.0 1.0 1.0 #pragma parameter EXTEND_H "Extend the fill horizontally" 1.0 0.0 1.0 1.0 diff --git a/border/shaders/blur_fill/compose.slang b/border/shaders/blur_fill/compose.slang index 94107e7e..fc6d1d1d 100644 --- a/border/shaders/blur_fill/compose.slang +++ b/border/shaders/blur_fill/compose.slang @@ -40,13 +40,13 @@ */ // clang-format off -#include "parameters.slang" -#include "../../../blurs/shaders/dual_filter/parameters.slang" -#include "../../../pixel-art-scaling/shaders/pixel_aa/parameters.slang" +#include "parameters.inc" +#include "../../../blurs/shaders/dual_filter/parameters.inc" +#include "../../../pixel-art-scaling/shaders/pixel_aa/parameters.inc" // clang-format on -#include "../../../misc/shaders/input_transform/input_transform.slang" -#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.slang" +#include "../../../misc/shaders/input_transform/input_transform.inc" +#include "../../../pixel-art-scaling/shaders/pixel_aa/shared.inc" layout(push_constant) uniform Push { vec4 InputSize; diff --git a/border/shaders/blur_fill/parameters.slang b/border/shaders/blur_fill/parameters.inc similarity index 90% rename from border/shaders/blur_fill/parameters.slang rename to border/shaders/blur_fill/parameters.inc index a9f10f9c..d5e3d438 100644 --- a/border/shaders/blur_fill/parameters.slang +++ b/border/shaders/blur_fill/parameters.inc @@ -3,7 +3,7 @@ // clang-format off #pragma parameter BLUR_FILL_SETTINGS "=== Blur fill v1.9 settings ===" 0.0 0.0 1.0 1.0 -#include "../../../misc/shaders/input_transform/parameters.slang" +#include "../../../misc/shaders/input_transform/parameters.inc" #pragma parameter OTHER_SETTINGS "= Other parameters =" 0.0 0.0 1.0 1.0 #pragma parameter EXTEND_H "Extend the fill horizontally" 0.0 0.0 1.0 1.0 diff --git a/border/shaders/blur_fill/render_sampling_areas.slang b/border/shaders/blur_fill/render_sampling_areas.slang index 9800a692..5653d2b7 100644 --- a/border/shaders/blur_fill/render_sampling_areas.slang +++ b/border/shaders/blur_fill/render_sampling_areas.slang @@ -2,8 +2,8 @@ // See compose.slang for copyright and other information. -#include "../../../misc/shaders/input_transform/input_transform.slang" -#include "parameters.slang" +#include "../../../misc/shaders/input_transform/input_transform.inc" +#include "parameters.inc" layout(push_constant) uniform Push { vec4 InputSize; diff --git a/misc/shaders/input_transform/input_transform.slang b/misc/shaders/input_transform/input_transform.inc similarity index 100% rename from misc/shaders/input_transform/input_transform.slang rename to misc/shaders/input_transform/input_transform.inc diff --git a/misc/shaders/input_transform/parameters.slang b/misc/shaders/input_transform/parameters.inc similarity index 100% rename from misc/shaders/input_transform/parameters.slang rename to misc/shaders/input_transform/parameters.inc diff --git a/pixel-art-scaling/shaders/pixel_aa/parameters.slang b/pixel-art-scaling/shaders/pixel_aa/parameters.inc similarity index 100% rename from pixel-art-scaling/shaders/pixel_aa/parameters.slang rename to pixel-art-scaling/shaders/pixel_aa/parameters.inc diff --git a/pixel-art-scaling/shaders/pixel_aa/pixel_aa.slang b/pixel-art-scaling/shaders/pixel_aa/pixel_aa.slang index 55bc7da8..7185e88f 100644 --- a/pixel-art-scaling/shaders/pixel_aa/pixel_aa.slang +++ b/pixel-art-scaling/shaders/pixel_aa/pixel_aa.slang @@ -33,8 +33,8 @@ v1.0: Initial release. */ -#include "parameters.slang" -#include "shared.slang" +#include "parameters.inc" +#include "shared.inc" layout(push_constant) uniform Push { vec4 SourceSize; diff --git a/pixel-art-scaling/shaders/pixel_aa/shared.slang b/pixel-art-scaling/shaders/pixel_aa/shared.inc similarity index 100% rename from pixel-art-scaling/shaders/pixel_aa/shared.slang rename to pixel-art-scaling/shaders/pixel_aa/shared.inc