[Bf-blender-cvs] [6b8bb26c457] master: EEVEE: Port existing EEVEE shaders and generated materials to use GPUShaderCreateInfo.

Thomas Dinges noreply at git.blender.org
Thu Dec 8 21:13:30 CET 2022


Commit: 6b8bb26c457446875e0782a1701ec35c78b33308
Author: Thomas Dinges
Date:   Thu Dec 8 21:07:28 2022 +0100
Branches: master
https://developer.blender.org/rB6b8bb26c457446875e0782a1701ec35c78b33308

EEVEE: Port existing EEVEE shaders and generated materials to use GPUShaderCreateInfo.

Required by Metal backend for efficient shader compilation. EEVEE material
resource binding permutations now controlled via CreateInfo and selected
based on material options. Other existing CreateInfo's also modified to
ensure explicitness for depth-writing mode. Other missing bindings also
addressed to ensure full compliance with the Metal backend.

Authored by Apple: Michael Parkin-White

Ref T96261

Reviewed By: fclem

Differential Revision: https://developer.blender.org/D16243

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

M	source/blender/draw/CMakeLists.txt
M	source/blender/draw/engines/eevee/eevee_lightcache.c
M	source/blender/draw/engines/eevee/eevee_lut_gen.c
M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/draw/engines/eevee/eevee_shaders.cc
M	source/blender/draw/engines/eevee/eevee_shaders_extra.cc
A	source/blender/draw/engines/eevee/engine_eevee_shared_defines.h
M	source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
M	source/blender/draw/engines/eevee/shaders/background_vert.glsl
M	source/blender/draw/engines/eevee/shaders/bsdf_lut_frag.glsl
M	source/blender/draw/engines/eevee/shaders/btdf_lut_frag.glsl
M	source/blender/draw/engines/eevee/shaders/closure_type_lib.glsl
M	source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl
M	source/blender/draw/engines/eevee/shaders/common_utiltex_lib.glsl
M	source/blender/draw/engines/eevee/shaders/cryptomatte_frag.glsl
D	source/blender/draw/engines/eevee/shaders/cryptomatte_lib.glsl
M	source/blender/draw/engines/eevee/shaders/cryptomatte_vert.glsl
M	source/blender/draw/engines/eevee/shaders/cubemap_lib.glsl
M	source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_dilate_tiles_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_downsample_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_filter_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_flatten_tiles_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_gather_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_lib.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_reduce_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_resolve_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_scatter_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_scatter_vert.glsl
M	source/blender/draw/engines/eevee/shaders/effect_dof_setup_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_downsample_cube_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_mist_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_motion_blur_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl
M	source/blender/draw/engines/eevee/shaders/effect_reflection_resolve_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_reflection_trace_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_subsurface_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl
M	source/blender/draw/engines/eevee/shaders/effect_translucency_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_velocity_resolve_frag.glsl
M	source/blender/draw/engines/eevee/shaders/effect_velocity_tile_frag.glsl
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_bloom_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_dof_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_effects_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_lightprobe_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_material_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_motion_blur_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_shadow_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh
A	source/blender/draw/engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
M	source/blender/draw/engines/eevee/shaders/irradiance_lib.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_cube_display_vert.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_geom.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_grid_display_vert.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_grid_fill_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_planar_display_vert.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_vert.glsl
A	source/blender/draw/engines/eevee/shaders/lightprobe_vert_no_geom.glsl
M	source/blender/draw/engines/eevee/shaders/lights_lib.glsl
M	source/blender/draw/engines/eevee/shaders/lookdev_world_frag.glsl
M	source/blender/draw/engines/eevee/shaders/ltc_lib.glsl
M	source/blender/draw/engines/eevee/shaders/object_motion_frag.glsl
M	source/blender/draw/engines/eevee/shaders/object_motion_vert.glsl
M	source/blender/draw/engines/eevee/shaders/prepass_frag.glsl
M	source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl
M	source/blender/draw/engines/eevee/shaders/renderpass_lib.glsl
M	source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl
M	source/blender/draw/engines/eevee/shaders/shadow_accum_frag.glsl
M	source/blender/draw/engines/eevee/shaders/shadow_vert.glsl
M	source/blender/draw/engines/eevee/shaders/ssr_lib.glsl
M	source/blender/draw/engines/eevee/shaders/surface_frag.glsl
M	source/blender/draw/engines/eevee/shaders/surface_lib.glsl
M	source/blender/draw/engines/eevee/shaders/surface_vert.glsl
M	source/blender/draw/engines/eevee/shaders/update_noise_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_accum_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_geom.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_integration_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_lib.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_resolve_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_scatter_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_vert.glsl
M	source/blender/draw/engines/eevee/shaders/world_vert.glsl
M	source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
M	source/blender/draw/engines/eevee_next/shaders/eevee_cryptomatte_lib.glsl
M	source/blender/draw/engines/eevee_next/shaders/eevee_film_lib.glsl
M	source/blender/draw/engines/eevee_next/shaders/infos/eevee_film_info.hh
M	source/blender/draw/engines/overlay/shaders/infos/overlay_armature_info.hh
M	source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_manager_shader.c
M	source/blender/draw/intern/draw_shader.cc
M	source/blender/draw/intern/draw_shader_shared.h
M	source/blender/draw/intern/shaders/common_attribute_lib.glsl
M	source/blender/draw/intern/shaders/common_hair_lib.glsl
M	source/blender/draw/intern/shaders/common_hair_refine_vert.glsl
M	source/blender/draw/intern/shaders/common_pointcloud_lib.glsl
M	source/blender/draw/intern/shaders/common_view_lib.glsl
M	source/blender/draw/intern/shaders/draw_hair_refine_info.hh
M	source/blender/draw/intern/shaders/draw_view_info.hh
M	source/blender/editors/animation/anim_markers.c
M	source/blender/editors/gpencil/annotate_paint.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/interface/interface_draw.cc
M	source/blender/editors/mask/mask_draw.c
M	source/blender/editors/sculpt_paint/paint_stroke.c
M	source/blender/editors/space_clip/clip_draw.c
M	source/blender/editors/space_graph/graph_draw.c
M	source/blender/editors/space_image/image_draw.c
M	source/blender/editors/space_nla/nla_draw.c
M	source/blender/editors/space_outliner/outliner_draw.cc
M	source/blender/editors/space_sequencer/sequencer_draw.c
M	source/blender/editors/space_view3d/view3d_cursor_snap.c
M	source/blender/editors/space_view3d/view3d_draw.cc
M	source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M	source/blender/editors/transform/transform_constraints.c
M	source/blender/editors/transform/transform_draw_cursors.c
M	source/blender/editors/transform/transform_mode_vert_slide.c
M	source/blender/editors/util/ed_draw.c
M	source/blender/editors/uvedit/uvedit_draw.c
M	source/blender/gpu/CMakeLists.txt
M	source/blender/gpu/GPU_capabilities.h
M	source/blender/gpu/GPU_shader_shared.h
M	source/blender/gpu/intern/gpu_capabilities.cc
M	source/blender/gpu/intern/gpu_capabilities_private.hh
M	source/blender/gpu/intern/gpu_shader.cc
M	source/blender/gpu/intern/gpu_shader_create_info.cc
M	source/blender/gpu/intern/gpu_shader_create_info.hh
M	source/blender/gpu/intern/gpu_shader_dependency.cc
M	source/blender/gpu/metal/kernels/depth_2d_update_info.hh
M	source/blender/gpu/metal/mtl_backend.mm
M	source/blender/gpu/metal/mtl_shader_generator.hh
M	source/blender/gpu/metal/mtl_shader_generator.mm
M	source/blender/gpu/opengl/gl_backend.cc
M	source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
M	source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_3D_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_diag_stripes_frag.glsl
M	source/blender/gpu/shaders/infos/gpu_shader_line_dashed_uniform_color_info.hh
M	source/blender/gpu/shaders/metal/mtl_shader_defines.msl
M	source/blender/windowmanager/intern/wm_gesture.c

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

diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 140354f5888..304c913526b 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -256,6 +256,7 @@ set(SRC
   engines/eevee/eevee_lightcache.h
   engines/eevee/eevee_lut.h
   engines/eevee/eevee_private.h
+  engines/eevee/engine_eevee_shared_defines.h
   engines/eevee_next/eevee_camera.hh
   engines/eevee_next/eevee_cryptomatte.hh
   engines/eevee_next/eevee_depth_of_field.hh
@@ -316,6 +317,7 @@ set(GLSL_SRC
   engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl
   engines/eevee/shaders/lightprobe_geom.glsl
   engines/eevee/shaders/lightprobe_vert.glsl
+  engines/eevee/shaders/lightprobe_vert_no_geom.glsl
   engines/eevee/shaders/lightprobe_cube_display_frag.glsl
   engines/eevee/shaders/lightprobe_cube_display_vert.glsl
   engines/eevee/shaders/lightprobe_grid_display_frag.glsl
@@ -381,7 +383,6 @@ set(GLSL_SRC
   engines/eevee/shaders/raytrace_lib.glsl
   engines/eevee/shaders/renderpass_lib.glsl
   engines/eevee/shaders/renderpass_postprocess_frag.glsl
-  engines/eevee/shaders/cryptomatte_lib.glsl
   engines/eevee/shaders/cryptomatte_frag.glsl
   engines/eevee/shaders/cryptomatte_vert.glsl
   engines/eevee/shaders/ltc_lib.glsl
@@ -400,6 +401,8 @@ set(GLSL_SRC
   engines/eevee/shaders/volumetric_scatter_frag.glsl
   engines/eevee/shaders/volumetric_integration_frag.glsl
   engines/eevee/shaders/world_vert.glsl
+  engines/eevee/shaders/infos/engine_eevee_legacy_shared.h
+  engines/eevee/engine_eevee_shared_defines.h
 
   engines/eevee_next/shaders/eevee_attributes_lib.glsl
   engines/eevee_next/shaders/eevee_camera_lib.glsl
diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.c b/source/blender/draw/engines/eevee/eevee_lightcache.c
index 26a264c1716..e0e7308e6d3 100644
--- a/source/blender/draw/engines/eevee/eevee_lightcache.c
+++ b/source/blender/draw/engines/eevee/eevee_lightcache.c
@@ -610,19 +610,22 @@ static void eevee_lightbake_context_enable(EEVEE_LightBake *lbake)
 
 static void eevee_lightbake_context_disable(EEVEE_LightBake *lbake)
 {
-  GPU_render_end();
+
   if (GPU_use_main_context_workaround() && !BLI_thread_is_main()) {
     DRW_opengl_context_disable();
+    GPU_render_end();
     GPU_context_main_unlock();
     return;
   }
 
   if (lbake->gl_context) {
     DRW_gpu_render_context_disable(lbake->gpu_context);
+    GPU_render_end();
     DRW_opengl_render_context_disable(lbake->gl_context);
   }
   else {
     DRW_opengl_context_disable();
+    GPU_render_end();
   }
 }
 
diff --git a/source/blender/draw/engines/eevee/eevee_lut_gen.c b/source/blender/draw/engines/eevee/eevee_lut_gen.c
index 9fab1a80c79..8be08874e27 100644
--- a/source/blender/draw/engines/eevee/eevee_lut_gen.c
+++ b/source/blender/draw/engines/eevee/eevee_lut_gen.c
@@ -63,7 +63,7 @@ float *EEVEE_lut_update_ggx_btdf(int lut_size, int lut_depth)
   DRWPass *pass = DRW_pass_create(__func__, DRW_STATE_WRITE_COLOR);
   DRWShadingGroup *grp = DRW_shgroup_create(EEVEE_shaders_ggx_refraction_lut_sh_get(), pass);
   DRW_shgroup_uniform_float_copy(grp, "sampleCount", 64.0f); /* Actual sample count is squared. */
-  DRW_shgroup_uniform_float(grp, "z", &roughness, 1);
+  DRW_shgroup_uniform_float(grp, "z_factor", &roughness, 1);
   DRW_shgroup_call_procedural_triangles(grp, NULL, 1);
 
   GPUTexture *tex = DRW_texture_create_2d_array(lut_size, lut_size, lut_depth, GPU_RG16F, 0, NULL);
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index e9b27354965..c8e571ee9d4 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -17,6 +17,8 @@
 
 #include "BKE_camera.h"
 
+#include "engine_eevee_shared_defines.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -28,18 +30,6 @@ struct RenderLayer;
 
 extern struct DrawEngineType draw_engine_eevee_type;
 
-/* Minimum UBO is 16384 bytes */
-#define MAX_PROBE 128 /* TODO: find size by dividing UBO max size by probe data size. */
-#define MAX_GRID 64   /* TODO: find size by dividing UBO max size by grid data size. */
-#define MAX_PLANAR 16 /* TODO: find size by dividing UBO max size by grid data size. */
-#define MAX_LIGHT 128 /* TODO: find size by dividing UBO max size by light data size. */
-#define MAX_CASCADE_NUM 4
-#define MAX_SHADOW 128 /* TODO: Make this depends on #GL_MAX_ARRAY_TEXTURE_LAYERS. */
-#define MAX_SHADOW_CASCADE 8
-#define MAX_SHADOW_CUBE (MAX_SHADOW - MAX_CASCADE_NUM * MAX_SHADOW_CASCADE)
-#define MAX_BLOOM_STEP 16
-#define MAX_AOVS 64
-
 /* Special value chosen to not be altered by depth of field sample count. */
 #define TAA_MAX_SAMPLE 10000926
 
@@ -55,23 +45,7 @@ extern struct DrawEngineType draw_engine_eevee_type;
 #  define SHADER_IRRADIANCE "#define IRRADIANCE_HL2\n"
 #endif
 
-/* Macro causes over indentation. */
-/* clang-format off */
-#define SHADER_DEFINES \
-  "#define EEVEE_ENGINE\n" \
-  "#define MAX_PROBE " STRINGIFY(MAX_PROBE) "\n" \
-  "#define MAX_GRID " STRINGIFY(MAX_GRID) "\n" \
-  "#define MAX_PLANAR " STRINGIFY(MAX_PLANAR) "\n" \
-  "#define MAX_LIGHT " STRINGIFY(MAX_LIGHT) "\n" \
-  "#define MAX_SHADOW " STRINGIFY(MAX_SHADOW) "\n" \
-  "#define MAX_SHADOW_CUBE " STRINGIFY(MAX_SHADOW_CUBE) "\n" \
-  "#define MAX_SHADOW_CASCADE " STRINGIFY(MAX_SHADOW_CASCADE) "\n" \
-  "#define MAX_CASCADE_NUM " STRINGIFY(MAX_CASCADE_NUM) "\n" \
-  SHADER_IRRADIANCE
-/* clang-format on */
-
 #define EEVEE_PROBE_MAX min_ii(MAX_PROBE, GPU_max_texture_layers() / 6)
-#define EEVEE_VELOCITY_TILE_SIZE 32
 #define USE_VOLUME_OPTI (GPU_shader_image_load_store_support())
 
 #define SWAP_DOUBLE_BUFFERS() \
@@ -194,19 +168,6 @@ typedef enum EEVEE_DofGatherPass {
   DOF_GATHER_MAX_PASS,
 } EEVEE_DofGatherPass;
 
-#define DOF_TILE_DIVISOR 16
-#define DOF_BOKEH_LUT_SIZE 32
-#define DOF_GATHER_RING_COUNT 5
-#define DOF_DILATE_RING_COUNT 3
-#define DOF_FAST_GATHER_COC_ERROR 0.05
-
-#define DOF_SHADER_DEFINES \
-  "#define DOF_TILE_DIVISOR " STRINGIFY(DOF_TILE_DIVISOR) "\n" \
-  "#define DOF_BOKEH_LUT_SIZE " STRINGIFY(DOF_BOKEH_LUT_SIZE) "\n" \
-  "#define DOF_GATHER_RING_COUNT " STRINGIFY(DOF_GATHER_RING_COUNT) "\n" \
-  "#define DOF_DILATE_RING_COUNT " STRINGIFY(DOF_DILATE_RING_COUNT) "\n" \
-  "#define DOF_FAST_GATHER_COC_ERROR " STRINGIFY(DOF_FAST_GATHER_COC_ERROR) "\n"
-
 /* ************ PROBE UBO ************* */
 
 /* They are the same struct as their Cache siblings.
@@ -1295,13 +1256,14 @@ struct GPUMaterial *EEVEE_material_get(
     EEVEE_Data *vedata, struct Scene *scene, Material *ma, World *wo, int options);
 void EEVEE_shaders_free(void);
 
-void eevee_shader_extra_init(void);
-void eevee_shader_extra_exit(void);
 void eevee_shader_material_create_info_amend(GPUMaterial *gpumat,
-                                             GPUCodegenOutput *codegen,
-                                             char *frag,
+                                             GPUCodegenOutput *codegen_,
                                              char *vert,
                                              char *geom,
+                                             char *frag,
+                                             const char *vert_info_name,
+                                             const char *geom_info_name,
+                                             const char *frag_info_name,
                                              char *defines);
 GPUShader *eevee_shaders_sh_create_helper(const char *name,
                                           const char *vert_name,
diff --git a/source/blender/draw/engines/eevee/eevee_shaders.cc b/source/blender/draw/engines/eevee/eevee_shaders.cc
index a8ff1bb307e..5143f08dc52 100644
--- a/source/blender/draw/engines/eevee/eevee_shaders.cc
+++ b/source/blender/draw/engines/eevee/eevee_shaders.cc
@@ -18,6 +18,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "GPU_capabilities.h"
+#include "GPU_context.h"
 #include "GPU_material.h"
 #include "GPU_shader.h"
 
@@ -26,13 +27,6 @@
 #include "eevee_engine.h"
 #include "eevee_private.h"
 
-static const char *filter_defines =
-#if defined(IRRADIANCE_SH_L2)
-    "#define IRRADIANCE_SH_L2\n";
-#elif defined(IRRADIANCE_HL2)
-    "#define IRRADIANCE_HL2\n";
-#endif
-
 static struct {
   /* Lookdev */
   struct GPUShader *studiolight_probe_sh;
@@ -165,6 +159,7 @@ static struct {
   } world;
 } e_data = {nullptr}; /* Engine data */
 
+extern "C" char datatoc_engine_eevee_legacy_shared_h[];
 extern "C" char datatoc_common_hair_lib_glsl[];
 extern "C" char datatoc_common_math_lib_glsl[];
 extern "C" char datatoc_common_math_geom_lib_glsl[];
@@ -172,65 +167,17 @@ extern "C" char datatoc_common_view_lib_glsl[];
 extern "C" char datatoc_gpu_shader_codegen_lib_glsl[];
 
 extern "C" char datatoc_ambient_occlusion_lib_glsl[];
-extern "C" char datatoc_background_vert_glsl[];
 extern "C" char datatoc_bsdf_common_lib_glsl[];
-extern "C" char datatoc_bsdf_lut_frag_glsl[];
 extern "C" char datatoc_bsdf_sampling_lib_glsl[];
-extern "C" char datatoc_btdf_lut_frag_glsl[];
 extern "C" char datatoc_closure_type_lib_glsl[];
 extern "C" char datatoc_closure_eval_volume_lib_glsl[];
 extern "C" char datatoc_common_uniforms_lib_glsl[];
 extern "C" char datatoc_common_utiltex_lib_glsl[];
-extern "C" char datatoc_cryptomatte_lib_glsl[];
-extern "C" char datatoc_cryptomatte_frag_glsl[];
-extern "C" char datatoc_cryptomatte_vert_glsl[];
 extern "C" char datatoc_cubemap_lib_glsl[];
-extern "C" char datatoc_default_frag_glsl[];
-extern "C" char datatoc_lookdev_world_frag_glsl[];
-extern "C" char datatoc_effect_bloom_frag_glsl[];
-extern "C" char datatoc_effect_dof_bokeh_frag_glsl[];
-extern "C" char datatoc_effect_dof_dilate_tiles_frag_glsl[];
-extern "C" char datatoc_effect_dof_downsample_frag_glsl[];
-extern "C" char datatoc_effect_dof_filter_frag_glsl[];
-extern "C" char datatoc_effect_dof_flatten_tiles_frag_glsl[];
-extern "C" char datatoc_effect_dof_gather_frag_glsl[];
 extern "C" char datatoc_effect_dof_lib_glsl[];
-extern "C" char datatoc_effect_dof_reduce_frag_glsl[];
-extern "C" char datatoc_effect_dof_resolve_frag_glsl[];
-extern "C" char datatoc_effect_dof_scatter_frag_glsl[];
-extern "C" char datatoc_effect_d

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list