[Bf-blender-cvs] [e8592a04129] eevee-motionblur-object: Merge branch 'master' into eevee-motionblur-object

[Clément Foucault]

Commit: e8592a04129087c28e61786f9a287221890cb65d
Author: Clément Foucault
Date:   Thu Jun 4 14:24:10 2020 +0200
Branches: eevee-motionblur-object
https://developer.blender.org/rBe8592a04129087c28e61786f9a287221890cb65d

Merge branch 'master' into eevee-motionblur-object

# Conflicts:
#	source/blender/draw/engines/eevee/eevee_data.c
#	source/blender/draw/engines/eevee/eevee_effects.c
#	source/blender/draw/engines/eevee/eevee_motion_blur.c
#	source/blender/gpu/GPU_vertex_format.h
#	source/blender/makesdna/DNA_userdef_types.h
#	source/blender/makesrna/intern/rna_userdef.c

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



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

diff --cc source/blender/draw/engines/eevee/eevee_data.c
index ad1dad6b61d,a19af77124f..5ca24d296c5
--- a/source/blender/draw/engines/eevee/eevee_data.c
+++ b/source/blender/draw/engines/eevee/eevee_data.c
@@@ -24,14 -24,8 +24,15 @@@
  
  #include "DRW_render.h"
  
 +#include "BLI_ghash.h"
+ #include "BLI_memblock.h"
  
- #include "BKE_anim.h"
++#include "BKE_duplilist.h"
 +
 +#include "DEG_depsgraph_query.h"
 +
 +#include "GPU_vertex_buffer.h"
 +
  #include "eevee_lightcache.h"
  #include "eevee_private.h"
  
diff --cc source/blender/draw/engines/eevee/eevee_effects.c
index ef80f63fe90,ab846fe0f11..6826b645971
--- a/source/blender/draw/engines/eevee/eevee_effects.c
+++ b/source/blender/draw/engines/eevee/eevee_effects.c
@@@ -338,12 -333,9 +338,11 @@@ void EEVEE_effects_cache_init(EEVEE_Vie
      grp = DRW_shgroup_create(EEVEE_shaders_velocity_resolve_sh_get(), psl->velocity_resolve);
      DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &e_data.depth_src);
      DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-     DRW_shgroup_uniform_block(
-         grp, "renderpass_block", EEVEE_material_default_render_pass_ubo_get(sldata));
+     DRW_shgroup_uniform_block(grp, "renderpass_block", sldata->renderpass_ubo.combined);
 -    DRW_shgroup_uniform_mat4(grp, "currPersinv", effects->velocity_curr_persinv);
 -    DRW_shgroup_uniform_mat4(grp, "pastPersmat", effects->velocity_past_persmat);
 +
 +    DRW_shgroup_uniform_mat4(grp, "prevViewProjMatrix", mb_data->camera[MB_PREV].persmat);
 +    DRW_shgroup_uniform_mat4(grp, "currViewProjMatrixInv", mb_data->camera[MB_CURR].persinv);
 +    DRW_shgroup_uniform_mat4(grp, "nextViewProjMatrix", mb_data->camera[MB_NEXT].persmat);
      DRW_shgroup_call(grp, quad, NULL);
    }
  }
diff --cc source/blender/draw/engines/eevee/eevee_temporal_sampling.c
index 9b63863d985,d57048f2c4e..d348c5aea8e
--- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
+++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c
@@@ -291,13 -292,11 +291,12 @@@ void EEVEE_temporal_sampling_cache_init
      DRW_shgroup_uniform_texture_ref(grp, "colorHistoryBuffer", &txl->taa_history);
      DRW_shgroup_uniform_texture_ref(grp, "colorBuffer", &effects->source_buffer);
      DRW_shgroup_uniform_block(grp, "common_block", sldata->common_ubo);
-     DRW_shgroup_uniform_block(
-         grp, "renderpass_block", EEVEE_material_default_render_pass_ubo_get(sldata));
+     DRW_shgroup_uniform_block(grp, "renderpass_block", sldata->renderpass_ubo.combined);
  
      if (effects->enabled_effects & EFFECT_TAA_REPROJECT) {
 -      // DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
 -      DRW_shgroup_uniform_texture_ref(grp, "velocityBuffer", &effects->velocity_tx);
 +      DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
 +      DRW_shgroup_uniform_texture_ref(grp, "depthBuffer", &dtxl->depth);
 +      DRW_shgroup_uniform_mat4(grp, "prevViewProjectionMatrix", effects->prev_drw_persmat);
      }
      else {
        DRW_shgroup_uniform_float(grp, "alpha", &effects->taa_alpha, 1);
diff --cc source/blender/gpu/GPU_vertex_format.h
index ae7d072298a,61b14a4c5c0..34bfbb27823
--- a/source/blender/gpu/GPU_vertex_format.h
+++ b/source/blender/gpu/GPU_vertex_format.h
@@@ -125,11 -124,7 +124,11 @@@ BLI_INLINE const char *GPU_vertformat_a
    return format->names + attr->names[n_idx];
  }
  
 +/* WARNING: Can only rename using a string with same character count.
 + * WARNING: This removes all other aliases of this attrib */
 +void GPU_vertformat_attr_rename(GPUVertFormat *format, int attr, const char *new_name);
 +
- void GPU_vertformat_safe_attrib_name(const char *attrib_name, char *r_safe_name, uint max_len);
+ void GPU_vertformat_safe_attr_name(const char *attr_name, char *r_safe_name, uint max_len);
  
  /* format conversion */