Merge pull request #583 from fishcu/fishcu/rename-includes-to-inc

Rename files that are included but no proper shader on their own to .inc
This commit is contained in:
hizzlekizzle 2024-04-29 16:28:19 -05:00 committed by GitHub
commit 7aff4e6ccd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 58 additions and 58 deletions

View file

@ -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

View file

@ -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

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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

View file

@ -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/

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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

View file

@ -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;

View file

@ -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"

View file

@ -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;

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -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;

View file

@ -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;