[Bf-blender-cvs] [162280ac224] tmp-gpu-shader-descriptor-2: Merge branch 'master' into tmp-gpu-shader-descriptor-2

[Jeroen Bakker]

Commit: 162280ac224660a9522ab8a2d62a833d45463ec0
Author: Jeroen Bakker
Date:   Mon Jan 10 13:32:40 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB162280ac224660a9522ab8a2d62a833d45463ec0

Merge branch 'master' into tmp-gpu-shader-descriptor-2

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 2794551a7a8,2a243eb9202..bdcad610c35
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -208,8 -211,8 +211,9 @@@ set(SR
    intern/draw_manager_profiling.h
    intern/draw_manager_testing.h
    intern/draw_manager_text.h
 +  intern/draw_shader_shared.h
    intern/draw_shader.h
+   intern/draw_subdivision.h
    intern/draw_texture_pool.h
    intern/draw_view.h
    intern/draw_view_data.h
@@@ -242,287 -244,268 +246,300 @@@ set(LI
    bf_windowmanager
  )
  
 -data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/background_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/common_uniforms_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/common_utiltex_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)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_geom.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_cube_display_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_cube_display_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_grid_display_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_grid_display_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_grid_fill_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_planar_display_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_planar_display_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lookdev_world_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/closure_eval_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/closure_eval_diffuse_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/closure_eval_glossy_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/closure_eval_refraction_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/closure_eval_translucent_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/closure_type_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_bloom_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_bokeh_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_dilate_tiles_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_downsample_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_filter_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_flatten_tiles_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_gather_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_reduce_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_resolve_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_scatter_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_scatter_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_dof_setup_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_reflection_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_reflection_resolve_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_reflection_trace_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_downsample_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_downsample_cube_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_gtao_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_velocity_resolve_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_velocity_tile_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_minmaxz_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_mist_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_motion_blur_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_subsurface_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_translucency_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/effect_temporal_aa.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/object_motion_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/object_motion_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/prepass_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/prepass_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/shadow_accum_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/shadow_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/shadow_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/bsdf_lut_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/btdf_lut_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/bsdf_common_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/irradiance_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/octahedron_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/cubemap_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/bsdf_sampling_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/random_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/raytrace_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/renderpass_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/renderpass_postprocess_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/cryptomatte_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/ltc_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/ssr_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/surface_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/surface_geom.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/surface_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/surface_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/update_noise_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_accum_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_lib.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_geom.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_vert.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_resolve_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_scatter_frag.glsl SRC)
 -data_to_c_simple(engines/eevee/shaders/volumetric_integration_frag.glsl SRC)
 +set(GLSL_SRC
 +  engines/eevee/shaders/ambient_occlusion_lib.glsl
 +  engines/eevee/shaders/background_vert.glsl
 +  engines/eevee/shaders/common_uniforms_lib.glsl
 +  engines/eevee/shaders/common_utiltex_lib.glsl
 +  engines/eevee/shaders/lights_lib.glsl
 +  engines/eevee/shaders/lightprobe_lib.glsl
 +  engines/eevee/shaders/lightprobe_filter_glossy_frag.glsl
 +  engines/eevee/shaders/lightprobe_filter_diffuse_frag.glsl
 +  engines/eevee/shaders/lightprobe_filter_visibility_frag.glsl
 +  engines/eevee/shaders/lightprobe_geom.glsl
 +  engines/eevee/shaders/lightprobe_vert.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
 +  engines/eevee/shaders/lightprobe_grid_display_vert.glsl
 +  engines/eevee/shaders/lightprobe_grid_fill_frag.glsl
 +  engines/eevee/shaders/lightprobe_planar_display_frag.glsl
 +  engines/eevee/shaders/lightprobe_planar_display_vert.glsl
 +  engines/eevee/shaders/lookdev_world_frag.glsl
 +  engines/eevee/shaders/closure_eval_lib.glsl
 +  engines/eevee/shaders/closure_eval_diffuse_lib.glsl
 +  engines/eevee/shaders/closure_eval_glossy_lib.glsl
 +  engines/eevee/shaders/closure_eval_refraction_lib.glsl
 +  engines/eevee/shaders/closure_eval_translucent_lib.glsl
 +  engines/eevee/shaders/closure_type_lib.glsl
 +  engines/eevee/shaders/effect_bloom_frag.glsl
 +  engines/eevee/shaders/effect_dof_bokeh_frag.glsl
 +  engines/eevee/shaders/effect_dof_dilate_tiles_frag.glsl
 +  engines/eevee/shaders/effect_dof_downsample_frag.glsl
 +  engines/eevee/shaders/effect_dof_filter_frag.glsl
 +  engines/eevee/shaders/effect_dof_flatten_tiles_frag.glsl
 +  engines/eevee/shaders/effect_dof_gather_frag.glsl
 +  engines/eevee/shaders/effect_dof_lib.glsl
 +  engines/eevee/shaders/effect_dof_reduce_frag.glsl
 +  engines/eevee/shaders/effect_dof_resolve_frag.glsl
 +  engines/eevee/shaders/effect_dof_scatter_frag.glsl
 +  engines/eevee/shaders/effect_dof_scatter_vert.glsl
 +  engines/eevee/shaders/effect_dof_setup_frag.glsl
 +  engines/eevee/shaders/effect_reflection_lib.glsl
 +  engines/eevee/shaders/effect_reflection_resolve_frag.glsl
 +  engines/eevee/shaders/effect_reflection_trace_frag.glsl
 +  engines/eevee/shaders/effect_downsample_frag.glsl
 +  engines/eevee/shaders/effect_downsample_cube_frag.glsl
 +  engines/eevee/shaders/effect_gtao_frag.glsl
 +  engines/eevee/shaders/effect_velocity_resolve_frag.glsl
 +  engines/eevee/shaders/effect_velocity_tile_frag.glsl
 +  engines/eevee/shaders/effect_minmaxz_frag.glsl
 +  engines/eevee/shaders/effect_mist_frag.glsl
 +  engines/eevee/shaders/effect_motion_blur_frag.glsl
 +  engines/eevee/shaders/effect_subsurface_frag.glsl
 +  engines/eevee/shaders/effect_translucency_frag.glsl
 +  engines/eevee/shaders/effect_temporal_aa.glsl
 +  engines/eevee/shaders/lightprobe_planar_downsample_frag.glsl
 +  engines/eevee/shaders/lightprobe_planar_downsample_geom.glsl
 +  engines/eevee/shaders/lightprobe_planar_downsample_vert.glsl
 +  engines/eevee/shaders/object_motion_frag.glsl
 +  engines/eevee/shaders/object_motion_vert.glsl
 +  engines/eevee/shaders/prepass_frag.glsl
 +  engines/eevee/shaders/prepass_vert.glsl
 +  engines/eevee/shaders/shadow_accum_frag

@@ Diff output truncated at 10240 characters. @@