diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-05 12:01:00 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-11 12:05:19 +0100 |
commit | fff4240bb43a9e5680017087def8b884a23ff657 (patch) | |
tree | 281fe803d2da04ee13d940bdbe692ee5bdcce8b0 /servers/visual/rasterizer_rd/shaders/blur_inc.glsl | |
parent | b509c814fcf91dbd4a9c19a307882dc26dec13e3 (diff) |
Fix code formatting issues and VS compilation
Also temporarily disable multicheck build so that we get a full build
even when there are style issues on Vulkan.
Fixes #33356.
Diffstat (limited to 'servers/visual/rasterizer_rd/shaders/blur_inc.glsl')
-rw-r--r-- | servers/visual/rasterizer_rd/shaders/blur_inc.glsl | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/servers/visual/rasterizer_rd/shaders/blur_inc.glsl b/servers/visual/rasterizer_rd/shaders/blur_inc.glsl index 275b547fc4..b6bfe13b95 100644 --- a/servers/visual/rasterizer_rd/shaders/blur_inc.glsl +++ b/servers/visual/rasterizer_rd/shaders/blur_inc.glsl @@ -1,16 +1,16 @@ -#define FLAG_HORIZONTAL (1<<0) -#define FLAG_USE_BLUR_SECTION (1<<1) -#define FLAG_USE_ORTHOGONAL_PROJECTION (1<<2) -#define FLAG_DOF_NEAR_FIRST_TAP (1<<3) -#define FLAG_GLOW_FIRST_PASS (1<<4) -#define FLAG_FLIP_Y (1<<5) +#define FLAG_HORIZONTAL (1 << 0) +#define FLAG_USE_BLUR_SECTION (1 << 1) +#define FLAG_USE_ORTHOGONAL_PROJECTION (1 << 2) +#define FLAG_DOF_NEAR_FIRST_TAP (1 << 3) +#define FLAG_GLOW_FIRST_PASS (1 << 4) +#define FLAG_FLIP_Y (1 << 5) layout(push_constant, binding = 1, std430) uniform Blur { vec4 section; vec2 pixel_size; uint flags; uint pad; - //glow + // Glow. float glow_strength; float glow_bloom; float glow_hdr_threshold; @@ -19,7 +19,7 @@ layout(push_constant, binding = 1, std430) uniform Blur { float glow_white; float glow_luminance_cap; float glow_auto_exposure_grey; - //dof + // DOF. float dof_begin; float dof_end; float dof_radius; @@ -30,7 +30,4 @@ layout(push_constant, binding = 1, std430) uniform Blur { float camera_z_near; vec4 ssao_color; - - - } blur; |