[Bf-blender-cvs] [090432e416f] viewport-compositor: GPU: Move shader utils into a common directory

[Omar Emara]

Commit: 090432e416f1e2cbc90e27d844d18c78f14423ea
Author: Omar Emara
Date:   Tue Nov 2 13:02:49 2021 +0200
Branches: viewport-compositor
https://developer.blender.org/rB090432e416f1e2cbc90e27d844d18c78f14423ea

GPU: Move shader utils into a common directory

This patches moves the math, color, and hash utils shader libraries into
a common directory to be used by both the compositor and materials.

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

M	source/blender/gpu/CMakeLists.txt
M	source/blender/gpu/intern/gpu_material_library.c
R100	source/blender/gpu/shaders/material/gpu_shader_material_color_util.glsl	source/blender/gpu/shaders/common/gpu_shader_common_color_util.glsl
R100	source/blender/gpu/shaders/material/gpu_shader_material_hash.glsl	source/blender/gpu/shaders/common/gpu_shader_common_hash.glsl
R100	source/blender/gpu/shaders/material/gpu_shader_material_math_util.glsl	source/blender/gpu/shaders/common/gpu_shader_common_math_util.glsl

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

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 8b9cc6e7ba6..68a49830203 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -275,6 +275,10 @@ data_to_c_simple(shaders/gpu_shader_codegen_lib.glsl SRC)
 
 data_to_c_simple(shaders/gpu_shader_geometry.glsl SRC)
 
+data_to_c_simple(shaders/common/gpu_shader_common_color_util.glsl SRC)
+data_to_c_simple(shaders/common/gpu_shader_common_math_util.glsl SRC)
+data_to_c_simple(shaders/common/gpu_shader_common_hash.glsl SRC)
+
 data_to_c_simple(shaders/composite/gpu_shader_composite_alpha_over.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_composite.glsl SRC)
 data_to_c_simple(shaders/composite/gpu_shader_composite_image.glsl SRC)
@@ -293,7 +297,6 @@ data_to_c_simple(shaders/material/gpu_shader_material_bump.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_camera.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_clamp.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_color_ramp.glsl SRC)
-data_to_c_simple(shaders/material/gpu_shader_material_color_util.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_combine_hsv.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_combine_rgb.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_combine_xyz.glsl SRC)
@@ -308,7 +311,6 @@ data_to_c_simple(shaders/material/gpu_shader_material_geometry.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_glass.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_glossy.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_hair_info.glsl SRC)
-data_to_c_simple(shaders/material/gpu_shader_material_hash.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_holdout.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_hue_sat_val.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_invert.glsl SRC)
@@ -318,7 +320,6 @@ data_to_c_simple(shaders/material/gpu_shader_material_light_path.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_mapping.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_map_range.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_math.glsl SRC)
-data_to_c_simple(shaders/material/gpu_shader_material_math_util.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_mix_rgb.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_mix_shader.glsl SRC)
 data_to_c_simple(shaders/material/gpu_shader_material_noise.glsl SRC)
diff --git a/source/blender/gpu/intern/gpu_material_library.c b/source/blender/gpu/intern/gpu_material_library.c
index e06043f81ef..80455e3dc74 100644
--- a/source/blender/gpu/intern/gpu_material_library.c
+++ b/source/blender/gpu/intern/gpu_material_library.c
@@ -41,10 +41,15 @@
  * If a file uses functions from another file, it must be added to the list of
  * dependencies, and be placed after that file in the list. */
 
+extern char datatoc_gpu_shader_common_color_util_glsl[];
+extern char datatoc_gpu_shader_common_math_util_glsl[];
+extern char datatoc_gpu_shader_common_hash_glsl[];
+
 extern char datatoc_gpu_shader_composite_alpha_over_glsl[];
 extern char datatoc_gpu_shader_composite_composite_glsl[];
 extern char datatoc_gpu_shader_composite_image_glsl[];
 extern char datatoc_gpu_shader_composite_invert_glsl[];
+
 extern char datatoc_gpu_shader_material_add_shader_glsl[];
 extern char datatoc_gpu_shader_material_ambient_occlusion_glsl[];
 extern char datatoc_gpu_shader_material_anisotropic_glsl[];
@@ -58,7 +63,6 @@ extern char datatoc_gpu_shader_material_bump_glsl[];
 extern char datatoc_gpu_shader_material_camera_glsl[];
 extern char datatoc_gpu_shader_material_clamp_glsl[];
 extern char datatoc_gpu_shader_material_color_ramp_glsl[];
-extern char datatoc_gpu_shader_material_color_util_glsl[];
 extern char datatoc_gpu_shader_material_combine_hsv_glsl[];
 extern char datatoc_gpu_shader_material_combine_rgb_glsl[];
 extern char datatoc_gpu_shader_material_combine_xyz_glsl[];
@@ -73,7 +77,6 @@ extern char datatoc_gpu_shader_material_geometry_glsl[];
 extern char datatoc_gpu_shader_material_glass_glsl[];
 extern char datatoc_gpu_shader_material_glossy_glsl[];
 extern char datatoc_gpu_shader_material_hair_info_glsl[];
-extern char datatoc_gpu_shader_material_hash_glsl[];
 extern char datatoc_gpu_shader_material_holdout_glsl[];
 extern char datatoc_gpu_shader_material_hue_sat_val_glsl[];
 extern char datatoc_gpu_shader_material_invert_glsl[];
@@ -83,7 +86,6 @@ extern char datatoc_gpu_shader_material_light_path_glsl[];
 extern char datatoc_gpu_shader_material_mapping_glsl[];
 extern char datatoc_gpu_shader_material_map_range_glsl[];
 extern char datatoc_gpu_shader_material_math_glsl[];
-extern char datatoc_gpu_shader_material_math_util_glsl[];
 extern char datatoc_gpu_shader_material_mix_rgb_glsl[];
 extern char datatoc_gpu_shader_material_mix_shader_glsl[];
 extern char datatoc_gpu_shader_material_noise_glsl[];
@@ -136,44 +138,44 @@ extern char datatoc_gpu_shader_material_volume_scatter_glsl[];
 extern char datatoc_gpu_shader_material_wireframe_glsl[];
 extern char datatoc_gpu_shader_material_world_normals_glsl[];
 
-static GPUMaterialLibrary gpu_shader_composite_alpha_over_library = {
-    .code = datatoc_gpu_shader_composite_alpha_over_glsl,
+static GPUMaterialLibrary gpu_shader_common_math_util_library = {
+    .code = datatoc_gpu_shader_common_math_util_glsl,
     .dependencies = {NULL},
 };
 
-static GPUMaterialLibrary gpu_shader_composite_composite_library = {
-    .code = datatoc_gpu_shader_composite_composite_glsl,
+static GPUMaterialLibrary gpu_shader_common_color_util_library = {
+    .code = datatoc_gpu_shader_common_color_util_glsl,
     .dependencies = {NULL},
 };
 
-static GPUMaterialLibrary gpu_shader_composite_image_library = {
-    .code = datatoc_gpu_shader_composite_image_glsl,
+static GPUMaterialLibrary gpu_shader_common_hash_library = {
+    .code = datatoc_gpu_shader_common_hash_glsl,
     .dependencies = {NULL},
 };
 
-static GPUMaterialLibrary gpu_shader_composite_invert_library = {
-    .code = datatoc_gpu_shader_composite_invert_glsl,
+static GPUMaterialLibrary gpu_shader_composite_alpha_over_library = {
+    .code = datatoc_gpu_shader_composite_alpha_over_glsl,
     .dependencies = {NULL},
 };
 
-static GPUMaterialLibrary gpu_shader_material_math_util_library = {
-    .code = datatoc_gpu_shader_material_math_util_glsl,
+static GPUMaterialLibrary gpu_shader_composite_composite_library = {
+    .code = datatoc_gpu_shader_composite_composite_glsl,
     .dependencies = {NULL},
 };
 
-static GPUMaterialLibrary gpu_shader_material_color_util_library = {
-    .code = datatoc_gpu_shader_material_color_util_glsl,
+static GPUMaterialLibrary gpu_shader_composite_image_library = {
+    .code = datatoc_gpu_shader_composite_image_glsl,
     .dependencies = {NULL},
 };
 
-static GPUMaterialLibrary gpu_shader_material_hash_library = {
-    .code = datatoc_gpu_shader_material_hash_glsl,
+static GPUMaterialLibrary gpu_shader_composite_invert_library = {
+    .code = datatoc_gpu_shader_composite_invert_glsl,
     .dependencies = {NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_noise_library = {
     .code = datatoc_gpu_shader_material_noise_glsl,
-    .dependencies = {&gpu_shader_material_hash_library, NULL},
+    .dependencies = {&gpu_shader_common_hash_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_fractal_noise_library = {
@@ -253,7 +255,7 @@ static GPUMaterialLibrary gpu_shader_material_color_ramp_library = {
 
 static GPUMaterialLibrary gpu_shader_material_combine_hsv_library = {
     .code = datatoc_gpu_shader_material_combine_hsv_glsl,
-    .dependencies = {&gpu_shader_material_color_util_library, NULL},
+    .dependencies = {&gpu_shader_common_color_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_combine_rgb_library = {
@@ -293,7 +295,7 @@ static GPUMaterialLibrary gpu_shader_material_fresnel_library = {
 
 static GPUMaterialLibrary gpu_shader_material_gamma_library = {
     .code = datatoc_gpu_shader_material_gamma_glsl,
-    .dependencies = {&gpu_shader_material_math_util_library, NULL},
+    .dependencies = {&gpu_shader_common_math_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_tangent_library = {
@@ -323,7 +325,7 @@ static GPUMaterialLibrary gpu_shader_material_holdout_library = {
 
 static GPUMaterialLibrary gpu_shader_material_hue_sat_val_library = {
     .code = datatoc_gpu_shader_material_hue_sat_val_glsl,
-    .dependencies = {&gpu_shader_material_color_util_library, NULL},
+    .dependencies = {&gpu_shader_common_color_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_invert_library = {
@@ -348,22 +350,22 @@ static GPUMaterialLibrary gpu_shader_material_light_path_library = {
 
 static GPUMaterialLibrary gpu_shader_material_mapping_library = {
     .code = datatoc_gpu_shader_material_mapping_glsl,
-    .dependencies = {&gpu_shader_material_math_util_library, NULL},
+    .dependencies = {&gpu_shader_common_math_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_map_range_library = {
     .code = datatoc_gpu_shader_material_map_range_glsl,
-    .dependencies = {&gpu_shader_material_math_util_library, NULL},
+    .dependencies = {&gpu_shader_common_math_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_math_library = {
     .code = datatoc_gpu_shader_material_math_glsl,
-    .dependencies = {&gpu_shader_material_math_util_library, NULL},
+    .dependencies = {&gpu_shader_common_math_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_mix_rgb_library = {
     .code = datatoc_gpu_shader_material_mix_rgb_glsl,
-    .dependencies = {&gpu_shader_material_color_util_library, NULL},
+    .dependencies = {&gpu_shader_common_color_util_library, NULL},
 };
 
 static GPUMaterialLibrary gpu_shader_material_mix_shader_library = {
@@ -428,7 +430,7 @@ static GPUMaterialLibrary gpu_shader_material_rgb_to_bw_library = {
 
 static GPUMaterialLibrary gpu_shader_material_separate_hsv_library = {
     .code = d

@@ Diff output truncated at 10240 characters. @@