Blender Git Loki

EEVEE: Fix shader compilation caused by latest merge

Merge branch 'draw-viewport-data' into eevee-rewrite

DRW: Fix implicit convertion warning on MSVC

Merge branch 'eevee-rewrite' into viewport-compositor

# Conflicts:
# source/blender/blenkernel/BKE_scene.h
# source/blender/blenkernel/intern/scene.c
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/intern/draw_manager.h
# source/blender/nodes/composite/nodes/node_composite_composite.cc

Merge branch 'draw-viewport-data' into eevee-rewrite

Merge branch 'master' into draw-viewport-data

Merge branch 'draw-viewport-data' into eevee-rewrite

# Conflicts:
# source/blender/draw/engines/eevee/eevee_cryptomatte.c
# source/blender/draw/engines/eevee/eevee_effects.c
# source/blender/draw/engines/eevee/eevee_engine.c
# source/blender/draw/engines/eevee/eevee_lookdev.c
# source/blender/draw/engines/eevee/eevee_materials.c
# source/blender/draw/engines/eevee/eevee_motion_blur.c
# source/blender/draw/engines/eevee/eevee_private.h
# source/blender/draw/engines/eevee/eevee_render.c
# source/blender/draw/engines/eevee/eevee_subsurface.c
# source/blender/draw/engines/eevee/eevee_volumes.c
# source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
# source/blender/draw/engines/eevee/shaders/effect_downsample_frag.glsl
# source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
# source/blender/draw/intern/DRW_render.h
# source/blender/draw/intern/draw_cache.h
# source/blender/gpu/GPU_material.h
# source/blender/gpu/intern/gpu_codegen.c
# source/blender/gpu/intern/gpu_material.c
# source/blender/gpu/shaders/gpu_shader_codegen_lib.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_hair_info.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_principled.glsl
# source/blender/gpu/shaders/material/gpu_shader_material_subsurface_scattering.glsl
# source/blender/makesdna/DNA_gpencil_types.h
# source/blender/makesdna/DNA_node_types.h
# source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
# source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c

Merge branch 'master' into draw-viewport-data

# Conflicts:
# source/blender/draw/DRW_engine.h
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/intern/draw_manager.h

Cleanup: Remove compiler warning and fix some comments

EEVEE: Fix crash when destroying the Instance (in debug build)

This was caused by the StructArrayBuffer wrapper not being tagged as NonMovable.
The UBO was in fact being freed at creation time in debug build, but the
pointer was kept as valid in the copied wrapper.

Changing the higher level structure to not use the copy constructor to avoid this.

Cleanup: Remove compiler warnings

Viewport Compositor: Add per view_data per DRWRenderView

This way we have correct handling of engine data. This fix issue
with infinite redraw and AA never converging.

Viewport Compositor: Fix render layer sampler name colision and leak

Viewport Compositor: Support multiple render layers

This adds the new DRWRenderScene structure (and its sub structures) that
contains all the needed render passes for each scene present in the
compositor nodetree.

The scenes are rendered using a special option to avoid rendering overlays.

The render layer input to the GPUMaterial are now a separate structure and
a separate list of input handled by the compositor engine.

Rendering all scenes is the first thing done to avoir much trouble with

There are still issues like continuous rendering of TAA because the same
DRWData is used for all scenes.

Viewport Compositor: Separate the compositor checkbox to its own tab

This is to make is visible under all engines.

Viewport Compositor: Support alpha over factor

Viewport Compositor: Add DEG eval callback and redraw listener

This is pretty basic but it gets the job done. This may change in
the future.

The `NodeType` (SHADING) for the `OperationKey` is not ideal.

Also it seems the tagging comming from the nodetree tag everything
as COPY_ON_WRITE update. Which is slow. To investigate.

Viewport Compositor: Add basic alphaOver node support

Not all feature are supported. For now expect both inputs to be
"premultiplied".

Viewport Compositor: Small fixes

Fix memory leak, a crash when resizing and wrong texture coordinate
in camera mode.

Change render layer sampler name to allow other texture to be bound.

Merge branch 'eevee-rewrite' into viewport-compositor