Merge branch 'master' into bevelv2

4 files changed, 20 insertions, 32 deletions

diff --git a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
index fd06cdc7f23..f6a96aaaff2 100644
--- a/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
+++ b/source/blender/draw/engines/eevee_next/eevee_shader_shared.hh
@@ -560,7 +560,7 @@ struct LightCullingData {
   uint local_lights_len;
   /** Items that are **NOT** processed by the 2.5D culling (i.e: Sun Lights). */
   uint sun_lights_len;
-  /** Number of items that passes the first culling test. */
+  /** Number of items that passes the first culling test. (local lights only) */
   uint visible_count;
   /** Extent of one square tile in pixels. */
   float tile_size;
diff --git a/source/blender/draw/engines/eevee_next/eevee_sync.cc b/source/blender/draw/engines/eevee_next/eevee_sync.cc
index 08cda6f47cf..cbd735ec29c 100644
--- a/source/blender/draw/engines/eevee_next/eevee_sync.cc
+++ b/source/blender/draw/engines/eevee_next/eevee_sync.cc
@@ -248,17 +248,17 @@ static void gpencil_stroke_sync(bGPDlayer * /*gpl*/,
     return;
   }
 
+  GPUBatch *geom = DRW_cache_gpencil_get(iter.ob, iter.cfra);
+
   if (show_fill) {
-    GPUBatch *geom = DRW_cache_gpencil_fills_get(iter.ob, iter.cfra);
     int vfirst = gps->runtime.fill_start * 3;
     int vcount = gps->tot_triangles * 3;
     gpencil_drawcall_add(iter, geom, material, vfirst, vcount, false);
   }
 
   if (show_stroke) {
-    GPUBatch *geom = DRW_cache_gpencil_strokes_get(iter.ob, iter.cfra);
     /* Start one vert before to have gl_InstanceID > 0 (see shader). */
-    int vfirst = gps->runtime.stroke_start - 1;
+    int vfirst = gps->runtime.stroke_start * 3;
     /* Include "potential" cyclic vertex and start adj vertex (see shader). */
     int vcount = gps->totpoints + 1 + 1;
     gpencil_drawcall_add(iter, geom, material, vfirst, vcount, true);
diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_geom_gpencil_vert.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_geom_gpencil_vert.glsl
index 38debf14eda..87a5bf71c45 100644
--- a/source/blender/draw/engines/eevee_next/shaders/eevee_geom_gpencil_vert.glsl
+++ b/source/blender/draw/engines/eevee_next/shaders/eevee_geom_gpencil_vert.glsl
@@ -16,30 +16,18 @@ void main()
   float hardness;
   vec2 thickness;
 
-  gl_Position = gpencil_vertex(ma,
-                               ma1,
-                               ma2,
-                               ma3,
-                               pos,
-                               pos1,
-                               pos2,
-                               pos3,
-                               uv1,
-                               uv2,
-                               col1,
-                               col2,
-                               fcol1,
-                               /* TODO */
-                               vec4(1024.0, 1024.0, 1.0 / 1024.0, 1.0 / 1024.0),
-                               interp.P,
-                               interp.N,
-                               g_color,
-                               strength,
-                               g_uvs,
-                               sspos,
-                               aspect,
-                               thickness,
-                               hardness);
+  gl_Position = gpencil_vertex(
+      /* TODO */
+      vec4(1024.0, 1024.0, 1.0 / 1024.0, 1.0 / 1024.0),
+      interp.P,
+      interp.N,
+      g_color,
+      strength,
+      g_uvs,
+      sspos,
+      aspect,
+      thickness,
+      hardness);
 #ifdef MAT_VELOCITY
   /* GPencil do not support deformation motion blur. */
   vec3 lP_curr = transform_point(ModelMatrixInverse, interp.P);
diff --git a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
index b632564a9ca..7883bf01aeb 100644
--- a/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
+++ b/source/blender/draw/engines/eevee_next/shaders/infos/eevee_material_info.hh
@@ -114,11 +114,11 @@ GPU_SHADER_CREATE_INFO(eevee_surf_deferred)
     // .image_out(5, Qualifier::WRITE, GPU_R11F_G11F_B10F, "gbuff_emission")
     /* Render-passes. */
     // .image_out(6, Qualifier::READ_WRITE, GPU_RGBA16F, "rpass_volume_light")
-    /* TODO: AOVs maybe? */
     .fragment_source("eevee_surf_deferred_frag.glsl")
-    // .additional_info("eevee_aov_out", "eevee_sampling_data", "eevee_camera",
-    // "eevee_utility_texture")
-    ;
+    .additional_info("eevee_camera",
+                     "eevee_utility_texture",
+                     "eevee_sampling_data",
+                     "eevee_aov_out");
 
 GPU_SHADER_CREATE_INFO(eevee_surf_forward)
     .vertex_out(eevee_surf_iface)