[Bf-blender-cvs] [83d902f33b0] tmp-eevee-glsl-cleanup: Cleanup: EEVEE: Remove concentric samples.

Clément Foucault noreply at git.blender.org
Sat Jul 11 14:42:17 CEST 2020


Commit: 83d902f33b048497bdb7394ef4e1d765778e6b82
Author: Clément Foucault
Date:   Mon Jul 6 21:15:36 2020 +0200
Branches: tmp-eevee-glsl-cleanup
https://developer.blender.org/rB83d902f33b048497bdb7394ef4e1d765778e6b82

Cleanup: EEVEE: Remove concentric samples.

===================================================================

M	source/blender/draw/CMakeLists.txt
D	source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl

===================================================================

diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 1ddae11999b..acf7a0dfa8d 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -189,7 +189,6 @@ data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/default_frag.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/background_vert.glsl SRC)
-data_to_c_simple(engines/eevee/shaders/concentric_samples_lib.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/common_uniforms_lib.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/lights_lib.glsl SRC)
 data_to_c_simple(engines/eevee/shaders/lightprobe_lib.glsl SRC)
diff --git a/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl b/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl
deleted file mode 100644
index 7e0e5945c54..00000000000
--- a/source/blender/draw/engines/eevee/shaders/concentric_samples_lib.glsl
+++ /dev/null
@@ -1,265 +0,0 @@
-/* Precomputed table of concentric samples.
- * Generated using this algorithm http://l2program.co.uk/900/concentric-disk-sampling
- * Sorted by radius then by rotation angle.
- * This way it's better for cache usage and for
- * easily restricting to a certain number of
- * sample while still having a circular kernel. */
-
-#define CONCENTRIC_SAMPLE_NUM 256
-const vec2 concentric[CONCENTRIC_SAMPLE_NUM] = vec2[CONCENTRIC_SAMPLE_NUM](
-    vec2(0.0441941738242, 0.0441941738242),
-    vec2(-0.0441941738242, -0.0441941738242),
-    vec2(-0.0441941738242, 0.0441941738242),
-    vec2(0.0441941738242, -0.0441941738242),
-    vec2(0.181111092429, 0.0485285709567),
-    vec2(0.132582521472, 0.132582521472),
-    vec2(-0.181111092429, 0.0485285709567),
-    vec2(0.0485285709567, 0.181111092429),
-    vec2(-0.181111092429, -0.0485285709567),
-    vec2(-0.0485285709567, 0.181111092429),
-    vec2(-0.132582521472, -0.132582521472),
-    vec2(-0.132582521472, 0.132582521472),
-    vec2(-0.0485285709567, -0.181111092429),
-    vec2(0.0485285709567, -0.181111092429),
-    vec2(0.132582521472, -0.132582521472),
-    vec2(0.181111092429, -0.0485285709567),
-    vec2(0.308652606436, 0.0488857703251),
-    vec2(0.278439538809, 0.141872031169),
-    vec2(0.220970869121, 0.220970869121),
-    vec2(-0.278439538809, 0.141872031169),
-    vec2(0.141872031169, 0.278439538809),
-    vec2(-0.308652606436, 0.0488857703251),
-    vec2(0.0488857703251, 0.308652606436),
-    vec2(-0.308652606436, -0.0488857703251),
-    vec2(-0.0488857703251, 0.308652606436),
-    vec2(-0.278439538809, -0.141872031169),
-    vec2(-0.141872031169, 0.278439538809),
-    vec2(-0.220970869121, -0.220970869121),
-    vec2(-0.220970869121, 0.220970869121),
-    vec2(-0.141872031169, -0.278439538809),
-    vec2(-0.0488857703251, -0.308652606436),
-    vec2(0.0488857703251, -0.308652606436),
-    vec2(0.141872031169, -0.278439538809),
-    vec2(0.220970869121, -0.220970869121),
-    vec2(0.278439538809, -0.141872031169),
-    vec2(0.308652606436, -0.0488857703251),
-    vec2(0.434749091828, 0.0489844582952),
-    vec2(0.41294895701, 0.144497089605),
-    vec2(0.370441837162, 0.232764033475),
-    vec2(0.309359216769, 0.309359216769),
-    vec2(-0.370441837162, 0.232764033475),
-    vec2(0.232764033475, 0.370441837162),
-    vec2(-0.41294895701, 0.144497089605),
-    vec2(0.144497089605, 0.41294895701),
-    vec2(-0.434749091828, 0.0489844582952),
-    vec2(0.0489844582952, 0.434749091828),
-    vec2(-0.434749091828, -0.0489844582952),
-    vec2(-0.0489844582952, 0.434749091828),
-    vec2(-0.41294895701, -0.144497089605),
-    vec2(-0.144497089605, 0.41294895701),
-    vec2(-0.370441837162, -0.232764033475),
-    vec2(-0.232764033475, 0.370441837162),
-    vec2(-0.309359216769, -0.309359216769),
-    vec2(-0.309359216769, 0.309359216769),
-    vec2(-0.232764033475, -0.370441837162),
-    vec2(-0.144497089605, -0.41294895701),
-    vec2(-0.0489844582952, -0.434749091828),
-    vec2(0.0489844582952, -0.434749091828),
-    vec2(0.144497089605, -0.41294895701),
-    vec2(0.232764033475, -0.370441837162),
-    vec2(0.309359216769, -0.309359216769),
-    vec2(0.370441837162, -0.232764033475),
-    vec2(0.41294895701, -0.144497089605),
-    vec2(0.434749091828, -0.0489844582952),
-    vec2(0.560359517677, 0.0490251052956),
-    vec2(0.543333277288, 0.14558571287),
-    vec2(0.509798130208, 0.237722772229),
-    vec2(0.460773024913, 0.322636745447),
-    vec2(0.397747564417, 0.397747564417),
-    vec2(-0.460773024913, 0.322636745447),
-    vec2(0.322636745447, 0.460773024913),
-    vec2(-0.509798130208, 0.237722772229),
-    vec2(0.237722772229, 0.509798130208),
-    vec2(-0.543333277288, 0.14558571287),
-    vec2(0.14558571287, 0.543333277288),
-    vec2(-0.560359517677, 0.0490251052956),
-    vec2(0.0490251052956, 0.560359517677),
-    vec2(-0.560359517677, -0.0490251052956),
-    vec2(-0.0490251052956, 0.560359517677),
-    vec2(-0.543333277288, -0.14558571287),
-    vec2(-0.14558571287, 0.543333277288),
-    vec2(-0.509798130208, -0.237722772229),
-    vec2(-0.237722772229, 0.509798130208),
-    vec2(-0.460773024913, -0.322636745447),
-    vec2(-0.322636745447, 0.460773024913),
-    vec2(-0.397747564417, -0.397747564417),
-    vec2(-0.397747564417, 0.397747564417),
-    vec2(-0.322636745447, -0.460773024913),
-    vec2(-0.237722772229, -0.509798130208),
-    vec2(-0.14558571287, -0.543333277288),
-    vec2(-0.0490251052956, -0.560359517677),
-    vec2(0.0490251052956, -0.560359517677),
-    vec2(0.14558571287, -0.543333277288),
-    vec2(0.237722772229, -0.509798130208),
-    vec2(0.322636745447, -0.460773024913),
-    vec2(0.397747564417, -0.397747564417),
-    vec2(0.460773024913, -0.322636745447),
-    vec2(0.509798130208, -0.237722772229),
-    vec2(0.543333277288, -0.14558571287),
-    vec2(0.560359517677, -0.0490251052956),
-    vec2(0.685748328795, 0.0490456884495),
-    vec2(0.671788470355, 0.146138636568),
-    vec2(0.644152935937, 0.240256623474),
-    vec2(0.603404305327, 0.32948367837),
-    vec2(0.550372103135, 0.412003395727),
-    vec2(0.486135912066, 0.486135912066),
-    vec2(-0.550372103135, 0.412003395727),
-    vec2(0.412003395727, 0.550372103135),
-    vec2(-0.603404305327, 0.32948367837),
-    vec2(0.32948367837, 0.603404305327),
-    vec2(-0.644152935937, 0.240256623474),
-    vec2(0.240256623474, 0.644152935937),
-    vec2(-0.671788470355, 0.146138636568),
-    vec2(0.146138636568, 0.671788470355),
-    vec2(-0.685748328795, 0.0490456884495),
-    vec2(0.0490456884495, 0.685748328795),
-    vec2(-0.685748328795, -0.0490456884495),
-    vec2(-0.0490456884495, 0.685748328795),
-    vec2(-0.671788470355, -0.146138636568),
-    vec2(-0.146138636568, 0.671788470355),
-    vec2(-0.644152935937, -0.240256623474),
-    vec2(-0.240256623474, 0.644152935937),
-    vec2(-0.603404305327, -0.32948367837),
-    vec2(-0.32948367837, 0.603404305327),
-    vec2(-0.550372103135, -0.412003395727),
-    vec2(-0.412003395727, 0.550372103135),
-    vec2(-0.486135912066, -0.486135912066),
-    vec2(-0.486135912066, 0.486135912066),
-    vec2(-0.412003395727, -0.550372103135),
-    vec2(-0.32948367837, -0.603404305327),
-    vec2(-0.240256623474, -0.644152935937),
-    vec2(-0.146138636568, -0.671788470355),
-    vec2(-0.0490456884495, -0.685748328795),
-    vec2(0.0490456884495, -0.685748328795),
-    vec2(0.146138636568, -0.671788470355),
-    vec2(0.240256623474, -0.644152935937),
-    vec2(0.32948367837, -0.603404305327),
-    vec2(0.412003395727, -0.550372103135),
-    vec2(0.486135912066, -0.486135912066),
-    vec2(0.550372103135, -0.412003395727),
-    vec2(0.603404305327, -0.32948367837),
-    vec2(0.644152935937, -0.240256623474),
-    vec2(0.671788470355, -0.146138636568),
-    vec2(0.685748328795, -0.0490456884495),
-    vec2(0.811017637806, 0.0490575291556),
-    vec2(0.799191174395, 0.146457218224),
-    vec2(0.775710704038, 0.241721231257),
-    vec2(0.740918624869, 0.33346040443),
-    vec2(0.695322283745, 0.420336974019),
-    vec2(0.639586577995, 0.501084084011),
-    vec2(0.574524259714, 0.574524259714),
-    vec2(-0.639586577995, 0.501084084011),
-    vec2(0.501084084011, 0.639586577995),
-    vec2(-0.695322283745, 0.420336974019),
-    vec2(0.420336974019, 0.695322283745),
-    vec2(-0.740918624869, 0.33346040443),
-    vec2(0.33346040443, 0.740918624869),
-    vec2(-0.775710704038, 0.241721231257),
-    vec2(0.241721231257, 0.775710704038),
-    vec2(-0.799191174395, 0.146457218224),
-    vec2(0.146457218224, 0.799191174395),
-    vec2(-0.811017637806, 0.0490575291556),
-    vec2(0.0490575291556, 0.811017637806),
-    vec2(-0.811017637806, -0.0490575291556),
-    vec2(-0.0490575291556, 0.811017637806),
-    vec2(-0.799191174395, -0.146457218224),
-    vec2(-0.146457218224, 0.799191174395),
-    vec2(-0.775710704038, -0.241721231257),
-    vec2(-0.241721231257, 0.775710704038),
-    vec2(-0.740918624869, -0.33346040443),
-    vec2(-0.33346040443, 0.740918624869),
-    vec2(-0.695322283745, -0.420336974019),
-    vec2(-0.420336974019, 0.695322283745),
-    vec2(-0.639586577995, -0.501084084011),
-    vec2(-0.501084084011, 0.639586577995),
-    vec2(-0.574524259714, -0.574524259714),
-    vec2(-0.574524259714, 0.574524259714),
-    vec2(-0.501084084011, -0.639586577995),
-    vec2(-0.420336974019, -0.695322283745),
-    vec2(-0.33346040443, -0.740918624869),
-    vec2(-0.241721231257, -0.775710704038),
-    vec2(-0.146457218224, -0.799191174395),
-    vec2(-0.0490575291556, -0.811017637806),
-    vec2(0.0490575291556, -0.811017637806),
-    vec2(0.146457218224, -0.799191174395),
-    vec2(0.241721231257, -0.775710704038),
-    vec2(0.33346040443, -0.740918624869),
-    vec2(0.420336974019, -0.695322283745),
-    vec2(0.501084084011, -0.639586577995),
-    vec2(0.574524259714, -0.574524259714),
-    vec2(0.639586577995, -0.501084084011),
-    vec2(0.695322283745, -0.420336974019),
-    vec2(0.740918624869, -0.33346040443),
-    vec2(0.775710704038, -0.241721231257),
-    vec2(0.799191174395, -0.146457218224),
-    vec2(0.811017637806, -0.0490575291556),
-    vec2(0.936215188832, 0.0490649589778),
-    vec2(0.925957819308, 0.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list