Skip to content

Commit d4fce33

Browse files
committed
Sort options
1 parent 57b86be commit d4fce33

24 files changed

+107
-75
lines changed

shaders/cAutoExposure.fx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
Automatic exposure shader using hardware blending
44
*/
55

6+
#include "shared/cMacros.fxh"
7+
#include "shared/cProcedural.fxh"
8+
9+
#define INCLUDE_CCAMERA_INPUT
10+
#define INCLUDE_CCAMERA_OUTPUT
11+
#include "shared/cCamera.fxh"
12+
13+
#define INCLUDE_CTONEMAP_OUTPUT
14+
#include "shared/cTonemap.fxh"
15+
616
/*
717
[Shader Options]
818
*/
@@ -44,16 +54,6 @@ uniform bool _DisplaySpotMeterMask <
4454
ui_type = "radio";
4555
> = false;
4656

47-
#include "shared/cMacros.fxh"
48-
#include "shared/cProcedural.fxh"
49-
50-
#define INCLUDE_CCAMERA_INPUT
51-
#define INCLUDE_CCAMERA_OUTPUT
52-
#include "shared/cCamera.fxh"
53-
54-
#define INCLUDE_CTONEMAP_OUTPUT
55-
#include "shared/cTonemap.fxh"
56-
5757
#include "shared/cShade.fxh"
5858
#include "shared/cBlend.fxh"
5959

shaders/cBloom.fx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11

2+
#include "shared/cBlur.fxh"
3+
#include "shared/cMath.fxh"
4+
5+
#define INCLUDE_CCAMERA_INPUT
6+
#define INCLUDE_CCAMERA_OUTPUT
7+
#include "shared/cCamera.fxh"
8+
9+
#define INCLUDE_CTONEMAP_OUTPUT
10+
#include "shared/cTonemap.fxh"
11+
212
/*
313
[Shader Options]
414
*/
@@ -44,16 +54,6 @@ uniform float3 _ColorShift <
4454
ui_max = 1.0;
4555
> = 1.0;
4656

47-
#include "shared/cBlur.fxh"
48-
#include "shared/cMath.fxh"
49-
50-
#define INCLUDE_CCAMERA_INPUT
51-
#define INCLUDE_CCAMERA_OUTPUT
52-
#include "shared/cCamera.fxh"
53-
54-
#define INCLUDE_CTONEMAP_OUTPUT
55-
#include "shared/cTonemap.fxh"
56-
5757
#include "shared/cShade.fxh"
5858
#include "shared/cBlend.fxh"
5959

shaders/cCAS.fx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
#include "shared/fidelityfx/cCAS.fxh"
3+
4+
/*
5+
[Shader Options]
6+
*/
7+
28
uniform int _RenderMode <
39
ui_label = "Render Mode";
410
ui_type = "combo";
@@ -20,8 +26,6 @@ uniform float _Contrast <
2026
ui_max = 1.0;
2127
> = 0.0;
2228

23-
#include "shared/fidelityfx/cCAS.fxh"
24-
2529
#include "shared/cShade.fxh"
2630
#include "shared/cBlend.fxh"
2731

shaders/cCheckerBoard.fx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
#include "shared/cMath.fxh"
3+
24
/*
35
[Shader Options]
46
*/
@@ -27,8 +29,6 @@ uniform bool _InvertCheckerboard <
2729
ui_type = "radio";
2830
> = false;
2931

30-
#include "shared/cMath.fxh"
31-
3232
#include "shared/cShade.fxh"
3333
#include "shared/cBlend.fxh"
3434

shaders/cChromaticity.fx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
#include "shared/cColor.fxh"
3+
24
/*
35
[Shader Options]
46
*/
@@ -9,8 +11,6 @@ uniform int _Select <
911
ui_items = "Length (XY)\0Length (XYZ)\0Average (XY)\0Average (XYZ)\0Sum (XY)\0Sum (XYZ)\0Max (XY)\0Max (XYZ)\0Ratio (XY)\0Spherical (XY)\0Hue-Saturation (HSI)\0Hue-Saturation (HSL)\0Hue-Saturation (HSV)\0CoCg (XY)\0CrCb (XY)\0";
1012
> = 0;
1113

12-
#include "shared/cColor.fxh"
13-
1414
#include "shared/cShade.fxh"
1515
#include "shared/cBlend.fxh"
1616

shaders/cCircles.fx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
#include "shared/cMacros.fxh"
3+
#include "shared/cColor.fxh"
4+
#include "shared/cMath.fxh"
5+
26
/*
37
[Shader Options]
48
*/
@@ -7,10 +11,6 @@
711
#define ENABLE_MONO 0
812
#endif
913

10-
#include "shared/cMacros.fxh"
11-
#include "shared/cColor.fxh"
12-
#include "shared/cMath.fxh"
13-
1414
#define MAX_CIRCLES GET_MIN(BUFFER_WIDTH, BUFFER_HEIGHT) / 10
1515

1616
#if !ENABLE_MONO

shaders/cColorBand.fx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
#include "shared/cProcedural.fxh"
3+
24
/*
35
[Shader Options]
46
*/
@@ -23,8 +25,6 @@ uniform int _DitherMethod <
2325
ui_items = "None\0Hash\0Interleaved Gradient Noise\0";
2426
> = 0;
2527

26-
#include "shared/cProcedural.fxh"
27-
2828
#include "shared/cShade.fxh"
2929
#include "shared/cBlend.fxh"
3030

shaders/cContrastNormalization.fx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11

2+
#include "shared/cColor.fxh"
3+
#include "shared/cMath.fxh"
4+
5+
/*
6+
[Shader Options]
7+
*/
8+
29
uniform int _Select <
310
ui_label = "Filter";
411
ui_type = "combo";
512
ui_items = "Local Contrast Normalization\0Census Transform\0";
613
> = 0;
714

8-
#include "shared/cColor.fxh"
9-
#include "shared/cMath.fxh"
10-
1115
#include "shared/cShade.fxh"
1216
#include "shared/cBlend.fxh"
1317

shaders/cDLAA.fx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
Copyright (C) LucasArts 2010-2011
88
*/
99

10+
#include "shared/cColor.fxh"
11+
12+
/*
13+
[Shader Options]
14+
*/
15+
1016
uniform int _RenderMode <
1117
ui_label = "Render Mode";
1218
ui_type = "combo";
@@ -25,8 +31,6 @@ static const float ContrastThresholds[5] =
2531
1.0 / 3.0, 1.0 / 4.0, 1.0 / 6.0, 1.0 / 8.0, 1.0 / 16.0
2632
};
2733

28-
#include "shared/cColor.fxh"
29-
3034
#include "shared/cShade.fxh"
3135
#include "shared/cBlend.fxh"
3236

shaders/cEnsor.fx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
#include "shared/cColor.fxh"
3+
4+
/*
5+
[Shader Options]
6+
*/
7+
28
uniform int _Blockiness <
39
ui_label = "Blockiness";
410
ui_type = "slider";
@@ -31,8 +37,6 @@ uniform int _DisplayMode <
3137
ui_items = "Output\0Mask\0";
3238
> = 0;
3339

34-
#include "shared/cColor.fxh"
35-
3640
#include "shared/cShade.fxh"
3741
#include "shared/cBlend.fxh"
3842

0 commit comments

Comments
 (0)