[Bf-blender-cvs] [7592c856815] temp-gpu-compute-shader-hair: Remove unused code.

[Jeroen Bakker]

Commit: 7592c8568150a1beb31868914496758f79a616dd
Author: Jeroen Bakker
Date:   Wed Apr 28 14:36:37 2021 +0200
Branches: temp-gpu-compute-shader-hair
https://developer.blender.org/rB7592c8568150a1beb31868914496758f79a616dd

Remove unused code.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/draw/intern/draw_cache_impl_hair.c
M	source/blender/draw/intern/draw_hair.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index f7b706dd643..2c9eee69e65 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit f7b706dd6434db2d752f47c4b8c3148b2990fd73
+Subproject commit 2c9eee69e654a8b654ea08e356391c192dcc56df
diff --git a/release/scripts/addons b/release/scripts/addons
index 4cb833e84ac..eb3952fcd26 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 4cb833e84acfd2be5fa08ce75118ce9cb60643b8
+Subproject commit eb3952fcd26e9897bcc0128eab925b070c0e7593
diff --git a/source/blender/draw/intern/draw_cache_impl_hair.c b/source/blender/draw/intern/draw_cache_impl_hair.c
index fd28ac00186..6424b21666d 100644
--- a/source/blender/draw/intern/draw_cache_impl_hair.c
+++ b/source/blender/draw/intern/draw_cache_impl_hair.c
@@ -243,7 +243,8 @@ static void hair_batch_cache_ensure_procedural_final_points(ParticleHairCache *c
   GPUVertFormat format = {0};
   GPU_vertformat_attr_add(&format, "pos", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
 
-  cache->final[subdiv].proc_buf = GPU_vertbuf_create_with_format(&format);
+  cache->final[subdiv].proc_buf = GPU_vertbuf_create_with_format_ex(&format,
+                                                                    GPU_USAGE_DEVICE_ONLY);
 
   /* Create a destination buffer for the transform feedback. Sized appropriately */
   /* Those are points! not line segments. */
diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c
index 2ea8edc6abd..4d9345c7574 100644
--- a/source/blender/draw/intern/draw_hair.c
+++ b/source/blender/draw/intern/draw_hair.c
@@ -44,8 +44,6 @@
 
 #include "draw_hair_private.h"
 
-#include "PIL_time_utildefines.h"
-
 #ifndef __APPLE__
 #  define USE_TRANSFORM_FEEDBACK
 #endif
@@ -158,22 +156,6 @@ static void drw_hair_particle_cache_shgrp_attach_resources(DRWShadingGroup *shgr
   DRW_shgroup_uniform_int(shgrp, "hairStrandsRes", &cache->final[subdiv].strands_res, 1);
 }
 
-#if 0
-static void drw_hair_particle_cache_update_compute(ParticleHairCache *cache, const int subdiv)
-{
-  const int final_points_len = cache->final[subdiv].strands_res * cache->strands_len;
-  if (final_points_len > 0) {
-    GPUShader *shader = hair_refine_shader_get(PART_REFINE_CATMULL_ROM);
-    GPU_shader_bind(shader);
-    GPU_shader_attach_vertex_buffer(shader, cache->final[subdiv].proc_buf, 0);
-    GPU_texture_bind(cache->point_tex, GPU_shader_get_uniform(shader, "hairPointBuffer"));
-    GPU_texture_bind(cache->strand_tex, GPU_shader_get_uniform(shader, "hairStrandBuffer"));
-    GPU_texture_bind(cache->strand_seg_tex, GPU_shader_get_uniform(shader, "hairStrandSegBuffer"));
-    GPU_shader_uniform_1i(shader, "hairStrandsRes", cache->final[subdiv].strands_res);
-    GPU_compute_dispatch(shader, cache->strands_len, cache->final[subdiv].strands_res, 1);
-  }
-}
-#else
 static void drw_hair_particle_cache_update_compute(ParticleHairCache *cache, const int subdiv)
 {
   const int final_points_len = cache->final[subdiv].strands_res * cache->strands_len;
@@ -185,7 +167,6 @@ static void drw_hair_particle_cache_update_compute(ParticleHairCache *cache, con
     DRW_shgroup_call_compute(shgrp, cache->strands_len, cache->final[subdiv].strands_res, 1);
   }
 }
-#endif
 
 static void drw_hair_particle_cache_update_transform_feedback(ParticleHairCache *cache,
                                                               const int subdiv)
@@ -369,7 +350,6 @@ DRWShadingGroup *DRW_shgroup_hair_create_sub(Object *object,
 
 void DRW_hair_update(void)
 {
-  TIMEIT_START(DRW_hair_update);
 #ifndef USE_TRANSFORM_FEEDBACK
   /**
    * Workaround to transform feedback not working on mac.
@@ -444,7 +424,6 @@ void DRW_hair_update(void)
     GPU_memory_barrier(GPU_BARRIER_SHADER_STORAGE);
   }
 #endif
-  TIMEIT_END(DRW_hair_update);
 }
 
 void DRW_hair_free(void)