diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-22 09:44:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-22 09:45:52 +0300 |
commit | 02f28da187b744b3dea0d253b3d46d91b201a98d (patch) | |
tree | bc91af2ee1f6304e7ee8402e8063874f2737f11d /source/blender/draw/engines/eevee/shaders | |
parent | ba711847554f6125ba75c7faf3bd876164f1edce (diff) |
Cleanup: trailing spaces
Applied to newly added files in 2.8
Diffstat (limited to 'source/blender/draw/engines/eevee/shaders')
29 files changed, 29 insertions, 29 deletions
diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl index 9f4f508d6fd..80d305cb1e8 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl @@ -823,4 +823,4 @@ void main() Closure cl = nodetree_exec(); fragColor = vec4(mix(vec3(1.0), cl.radiance, cl.opacity), 1.0); } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl index ddc7327334c..d5b54097638 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_direct_lib.glsl @@ -153,4 +153,4 @@ vec3 direct_ggx_unit_disc(LightData ld, vec3 N, vec3 V, float roughness, vec3 f0 return spec; } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl index b8fac61519e..7fb4ee51a96 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl @@ -43,4 +43,4 @@ void main() { fresnel_accum /= sampleCount; FragColor = vec4(brdf_accum, fresnel_accum, 0.0, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl index e5c0cb9c9c9..cce9d59dc12 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_sampling_lib.glsl @@ -104,4 +104,4 @@ vec3 sample_cone(float nsample, float angle, vec3 N, vec3 T, vec3 B) return tangent_to_world(Ht, N, T, B); } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl b/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl index 2c604d69641..5f0af6a6f5b 100644 --- a/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl @@ -56,4 +56,4 @@ void main() { btdf_accum /= sampleCount; FragColor = vec4(btdf_accum, 0.0, 0.0, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl index 37106fc32bd..d6abb7dc175 100644 --- a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl @@ -52,4 +52,4 @@ layout(std140) uniform common_block { /* ssrParameters */ #define ssrQuality ssrParameters.x #define ssrThickness ssrParameters.y -#define ssrPixelSize ssrParameters.zw
\ No newline at end of file +#define ssrPixelSize ssrParameters.zw diff --git a/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl b/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl index 67bcf603a81..7de27a9fda9 100644 --- a/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl @@ -264,4 +264,4 @@ vec2[CONCENTRIC_SAMPLE_NUM]( vec2(0.905555462146, -0.242642854784), vec2(0.925957819308, -0.146657310975), vec2(0.936215188832, -0.0490649589778) -);
\ No newline at end of file +); diff --git a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl index 29543e82f43..c3674c8f74c 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl @@ -215,4 +215,4 @@ void main(void) #elif defined(STEP_RESOLVE) FragColor = step_resolve(); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl index 0f5c5e5b16b..05f5eb78253 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_dof_vert.glsl @@ -96,4 +96,4 @@ void main() #elif defined(STEP_RESOLVE) passthrough(); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl index eb463d51146..79f86cfae58 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl @@ -27,4 +27,4 @@ void main() vec3 cubevec = x_axis[fFace] * uvs.x + y_axis[fFace] * uvs.y + maj_axes[fFace]; FragColor = textureLod(source, cubevec, 0.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl index 156be108a14..8f06e161a20 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl @@ -34,4 +34,4 @@ void main() float luma = max(1e-8, brightness(FragColor.rgb)); FragColor *= 1.0 - max(0.0, luma - fireflyFactor) / luma; #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl index c11dbdd59ad..24dbb5436d9 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl @@ -93,4 +93,4 @@ void main() fragColor = vec4(val); #endif gl_FragDepth = val; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl index aa88e365d93..6c21d7d6fef 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_ssr_frag.glsl @@ -502,7 +502,7 @@ void main() if (weight_acc > 0.0) { ssr_accum /= weight_acc; /* fade between 0.5 and 1.0 roughness */ - ssr_accum.a *= smoothstep(ssrMaxRoughness + 0.2, ssrMaxRoughness, roughness); + ssr_accum.a *= smoothstep(ssrMaxRoughness + 0.2, ssrMaxRoughness, roughness); accumulate_light(ssr_accum.rgb, ssr_accum.a, spec_accum); } diff --git a/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl b/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl index b3b94b0a391..d4fbac21563 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl @@ -99,4 +99,4 @@ void main() vec4 color_history = texelFetch(colorHistoryBuffer, texel, 0); FragColor = mix(color_history, color, alpha); } -#endif
\ No newline at end of file +#endif diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl index 57da4d0d1ec..b0a6cbe1707 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl @@ -23,4 +23,4 @@ void main() worldPosition = wpos.xyz; gl_Position = ViewProjectionMatrix * wpos; worldNormal = normalize(pos); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl index b19ee7a9ea3..14fd6d3dff5 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl @@ -195,4 +195,4 @@ void main() FragColor = irradiance_encode(intensityFac * out_radiance / weight); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl index 3aec3ce4642..e4199e6a5ed 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl @@ -84,4 +84,4 @@ void main() { } FragColor = vec4(intensityFac * out_radiance / weight, 1.0); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl index 0727e73f507..211fa8f0ce8 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl @@ -85,4 +85,4 @@ void main() /* Encode to normalized RGBA 8 */ FragColor = visibility_encode(accum, visibilityRange); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl index 7e63f4cdaf7..2ce37d867b7 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl @@ -31,4 +31,4 @@ void main() { } EndPrimitive(); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl index 37f73714a8e..a017a791e41 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl @@ -29,4 +29,4 @@ void main() gl_Position = ViewProjectionMatrix * vec4(pos * 0.02 * sphere_size + ws_cell_location, 1.0); worldNormal = normalize(pos); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl index c9e66ceffb2..ced8e7f4f01 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl @@ -17,4 +17,4 @@ void main() if (any(greaterThanEqual(ivec2(gl_FragCoord.xy), data_size))) { FragColor = vec4(0.0, 0.0, 0.0, 1.0); } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl index 3ecd85fd72e..a71a3bef1e1 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl @@ -12,4 +12,4 @@ void main() gl_Position = ViewProjectionMatrix * probe_mat * vec4(pos, 1.0); worldPosition = (probe_mat * vec4(pos, 1.0)).xyz; probeIdx = probe_id; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl index 3b3abdef00c..d629195b815 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl @@ -37,4 +37,4 @@ void main() float luma = max(1e-8, brightness(FragColor.rgb)); FragColor *= 1.0 - max(0.0, luma - fireflyFactor) / luma; #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl index 23c16f0fa30..721cc8789a0 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl @@ -21,4 +21,4 @@ void main() { EmitVertex(); EndPrimitive(); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl index ac4e3da4158..d682e39d8ad 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl @@ -7,4 +7,4 @@ out vec2 vPos; void main() { instance = gl_InstanceID; vPos = pos; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl b/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl index f5077d52845..bbb77af673a 100644 --- a/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl @@ -7,4 +7,4 @@ flat out int face; void main() { vPos = vec4(pos, 1.0); face = gl_InstanceID; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl index d25c49098a6..cbc4c80e59b 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_vert.glsl @@ -40,4 +40,4 @@ void main() { #ifdef ATTRIB pass_attrib(pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl index 9fa57b8e136..6b6479089f6 100644 --- a/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/shadow_vert.glsl @@ -30,4 +30,4 @@ void main() { pass_attrib(pos); #endif #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl b/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl index 15e9696a4c5..c5c97b97734 100644 --- a/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl @@ -60,4 +60,4 @@ void main() finalTransmittance *= Tr; } -}
\ No newline at end of file +} |