Cleanup: Curves: Remove GPUTexture wrappers for buffer texture

These are unecessary now that we can bind buffers as textures directly.

10 files changed, 46 insertions, 141 deletions

diff --git a/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc b/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
index 1bba2a366a5..68de5dcd11d 100644
--- a/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
+++ b/source/blender/draw/engines/overlay/overlay_sculpt_curves.cc
@@ -64,7 +64,7 @@ void OVERLAY_sculpt_curves_cache_populate(OVERLAY_Data *vedata, Object *object)
                                                                      ".selection_curve_float";
 
   bool is_point_domain;
-  GPUTexture **texture = DRW_curves_texture_for_evaluated_attribute(
+  GPUVertBuf **texture = DRW_curves_texture_for_evaluated_attribute(
       curves, name, &is_point_domain);
   if (texture == nullptr) {
     return;
@@ -78,7 +78,7 @@ void OVERLAY_sculpt_curves_cache_populate(OVERLAY_Data *vedata, Object *object)
   }
 
   DRW_shgroup_uniform_bool_copy(grp, "is_point_domain", is_point_domain);
-  DRW_shgroup_uniform_texture(grp, "selection_tx", *texture);
+  DRW_shgroup_buffer_texture(grp, "selection_tx", *texture);
 }
 
 void OVERLAY_sculpt_curves_draw(OVERLAY_Data *vedata)
diff --git a/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc b/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc
index 84bbf2ae351..c0d74ea73f3 100644
--- a/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc
+++ b/source/blender/draw/engines/overlay/overlay_viewer_attribute.cc
@@ -144,13 +144,13 @@ static void populate_cache_for_geometry(Object &object,
       const bke::CurvesGeometry &curves = bke::CurvesGeometry::wrap(curves_id->geometry);
       if (curves.attributes().contains(".viewer")) {
         bool is_point_domain;
-        GPUTexture **texture = DRW_curves_texture_for_evaluated_attribute(
+        GPUVertBuf **texture = DRW_curves_texture_for_evaluated_attribute(
             curves_id, ".viewer", &is_point_domain);
         DRWShadingGroup *grp = DRW_shgroup_curves_create_sub(
             &object, pd.viewer_attribute_curves_grp, nullptr);
         DRW_shgroup_uniform_float_copy(pd.viewer_attribute_curves_grp, "opacity", opacity);
         DRW_shgroup_uniform_bool_copy(grp, "is_point_domain", is_point_domain);
-        DRW_shgroup_uniform_texture(grp, "color_tx", *texture);
+        DRW_shgroup_buffer_texture(grp, "color_tx", *texture);
       }
       break;
     }
diff --git a/source/blender/draw/intern/draw_cache_impl.h b/source/blender/draw/intern/draw_cache_impl.h
index e9b1b4c7d16..5aa2203ca68 100644
--- a/source/blender/draw/intern/draw_cache_impl.h
+++ b/source/blender/draw/intern/draw_cache_impl.h
@@ -132,7 +132,7 @@ int DRW_curves_material_count_get(struct Curves *curves);
  * \return A pointer to location where the texture will be
  * stored, which will be filled by #DRW_shgroup_curves_create_sub.
  */
-struct GPUTexture **DRW_curves_texture_for_evaluated_attribute(struct Curves *curves,
+struct GPUVertBuf **DRW_curves_texture_for_evaluated_attribute(struct Curves *curves,
                                                                const char *name,
                                                                bool *r_is_point_domain);
 
diff --git a/source/blender/draw/intern/draw_cache_impl_curves.cc b/source/blender/draw/intern/draw_cache_impl_curves.cc
index 85dd9ca8695..c36b90ec32e 100644
--- a/source/blender/draw/intern/draw_cache_impl_curves.cc
+++ b/source/blender/draw/intern/draw_cache_impl_curves.cc
@@ -88,13 +88,11 @@ static void curves_discard_attributes(CurvesEvalCache &curves_cache)
 {
   for (const int i : IndexRange(GPU_MAX_ATTR)) {
     GPU_VERTBUF_DISCARD_SAFE(curves_cache.proc_attributes_buf[i]);
-    DRW_TEXTURE_FREE_SAFE(curves_cache.proc_attributes_tex[i]);
   }
 
   for (const int i : IndexRange(MAX_HAIR_SUBDIV)) {
     for (const int j : IndexRange(GPU_MAX_ATTR)) {
       GPU_VERTBUF_DISCARD_SAFE(curves_cache.final[i].attributes_buf[j]);
-      DRW_TEXTURE_FREE_SAFE(curves_cache.final[i].attributes_tex[j]);
     }
 
     drw_attributes_clear(&curves_cache.final[i].attr_used);
@@ -107,17 +105,12 @@ static void curves_batch_cache_clear_data(CurvesEvalCache &curves_cache)
   GPU_VERTBUF_DISCARD_SAFE(curves_cache.proc_point_buf);
   GPU_VERTBUF_DISCARD_SAFE(curves_cache.proc_length_buf);
   GPU_VERTBUF_DISCARD_SAFE(curves_cache.data_edit_points);
-  DRW_TEXTURE_FREE_SAFE(curves_cache.point_tex);
-  DRW_TEXTURE_FREE_SAFE(curves_cache.length_tex);
 
   GPU_VERTBUF_DISCARD_SAFE(curves_cache.proc_strand_buf);
   GPU_VERTBUF_DISCARD_SAFE(curves_cache.proc_strand_seg_buf);
-  DRW_TEXTURE_FREE_SAFE(curves_cache.strand_tex);
-  DRW_TEXTURE_FREE_SAFE(curves_cache.strand_seg_tex);
 
   for (const int i : IndexRange(MAX_HAIR_SUBDIV)) {
     GPU_VERTBUF_DISCARD_SAFE(curves_cache.final[i].proc_buf);
-    DRW_TEXTURE_FREE_SAFE(curves_cache.final[i].proc_tex);
     for (const int j : IndexRange(MAX_THICKRES)) {
       GPU_BATCH_DISCARD_SAFE(curves_cache.final[i].proc_hairs[j]);
     }
@@ -286,21 +279,6 @@ static void curves_batch_cache_ensure_procedural_pos(const Curves &curves,
                                 cache.strands_len};
 
     curves_batch_cache_fill_segments_proc_pos(curves, posTime_data, hairLength_data);
-
-    /* Create vbo immediately to bind to texture buffer. */
-    GPU_vertbuf_use(cache.proc_point_buf);
-    cache.point_tex = GPU_texture_create_from_vertbuf("hair_point", cache.proc_point_buf);
-  }
-
-  if (gpu_material && cache.proc_length_buf != nullptr && cache.length_tex) {
-    ListBase gpu_attrs = GPU_material_attributes(gpu_material);
-    LISTBASE_FOREACH (GPUMaterialAttribute *, attr, &gpu_attrs) {
-      if (attr->type == CD_HAIRLENGTH) {
-        GPU_vertbuf_use(cache.proc_length_buf);
-        cache.length_tex = GPU_texture_create_from_vertbuf("hair_length", cache.proc_length_buf);
-        break;
-      }
-    }
   }
 }
 
@@ -363,12 +341,6 @@ static void curves_batch_cache_ensure_procedural_final_attr(CurvesEvalCache &cac
   /* Those are points! not line segments. */
   GPU_vertbuf_data_alloc(final_cache.attributes_buf[index],
                          final_cache.strands_res * cache.strands_len);
-
-  /* Create vbo immediately to bind to texture buffer. */
-  GPU_vertbuf_use(final_cache.attributes_buf[index]);
-
-  final_cache.attributes_tex[index] = GPU_texture_create_from_vertbuf(
-      name, final_cache.attributes_buf[index]);
 }
 
 static void curves_batch_ensure_attribute(const Curves &curves,
@@ -379,7 +351,6 @@ static void curves_batch_ensure_attribute(const Curves &curves,
 {
   using namespace blender;
   GPU_VERTBUF_DISCARD_SAFE(cache.proc_attributes_buf[index]);
-  DRW_TEXTURE_FREE_SAFE(cache.proc_attributes_tex[index]);
 
   char sampler_name[32];
   drw_curves_get_attribute_sampler_name(request.attribute_name, sampler_name);
@@ -414,13 +385,9 @@ static void curves_batch_ensure_attribute(const Curves &curves,
 
   attribute.materialize(vbo_span);
 
-  GPU_vertbuf_use(attr_vbo);
-  cache.proc_attributes_tex[index] = GPU_texture_create_from_vertbuf(sampler_name, attr_vbo);
-
   /* Existing final data may have been for a different attribute (with a different name or domain),
    * free the data. */
   GPU_VERTBUF_DISCARD_SAFE(cache.final[subdiv].attributes_buf[index]);
-  DRW_TEXTURE_FREE_SAFE(cache.final[subdiv].attributes_tex[index]);
 
   /* Ensure final data for points. */
   if (request.domain == ATTR_DOMAIN_POINT) {
@@ -466,19 +433,11 @@ static void curves_batch_cache_ensure_procedural_strand_data(Curves &curves,
   GPU_vertbuf_attr_get_raw_data(cache.proc_strand_seg_buf, seg_id, &seg_step);
 
   curves_batch_cache_fill_strands_data(curves, data_step, seg_step);
-
-  /* Create vbo immediately to bind to texture buffer. */
-  GPU_vertbuf_use(cache.proc_strand_buf);
-  cache.strand_tex = GPU_texture_create_from_vertbuf("curves_strand", cache.proc_strand_buf);
-
-  GPU_vertbuf_use(cache.proc_strand_seg_buf);
-  cache.strand_seg_tex = GPU_texture_create_from_vertbuf("curves_strand_seg",
-                                                         cache.proc_strand_seg_buf);
 }
 
 static void curves_batch_cache_ensure_procedural_final_points(CurvesEvalCache &cache, int subdiv)
 {
-  /* Same format as point_tex. */
+  /* Same format as proc_point_buf. */
   GPUVertFormat format = {0};
   GPU_vertformat_attr_add(&format, "pos", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
 
@@ -489,12 +448,6 @@ static void curves_batch_cache_ensure_procedural_final_points(CurvesEvalCache &c
   /* Those are points! not line segments. */
   GPU_vertbuf_data_alloc(cache.final[subdiv].proc_buf,
                          cache.final[subdiv].strands_res * cache.strands_len);
-
-  /* Create vbo immediately to bind to texture buffer. */
-  GPU_vertbuf_use(cache.final[subdiv].proc_buf);
-
-  cache.final[subdiv].proc_tex = GPU_texture_create_from_vertbuf("hair_proc",
-                                                                 cache.final[subdiv].proc_buf);
 }
 
 static void curves_batch_cache_fill_segments_indices(const Curves &curves,
@@ -583,7 +536,6 @@ static bool curves_ensure_attributes(const Curves &curves,
       /* Some new attributes have been added, free all and start over. */
       for (const int i : IndexRange(GPU_MAX_ATTR)) {
         GPU_VERTBUF_DISCARD_SAFE(cache.curves_cache.proc_attributes_buf[i]);
-        DRW_TEXTURE_FREE_SAFE(cache.curves_cache.proc_attributes_tex[i]);
       }
       drw_attributes_merge(&final_cache.attr_used, &attrs_needed, cache.render_mutex);
     }
@@ -631,7 +583,7 @@ bool curves_ensure_procedural_data(Curves *curves,
   }
 
   /* Refreshed if active layer or custom data changes. */
-  if ((*r_hair_cache)->strand_tex == nullptr) {
+  if ((*r_hair_cache)->proc_strand_buf == nullptr) {
     curves_batch_cache_ensure_procedural_strand_data(*curves, cache.curves_cache);
   }
 
@@ -689,7 +641,7 @@ static void request_attribute(Curves &curves, const char *name)
   drw_attributes_merge(&final_cache.attr_used, &attributes, cache.render_mutex);
 }
 
-GPUTexture **DRW_curves_texture_for_evaluated_attribute(Curves *curves,
+GPUVertBuf **DRW_curves_texture_for_evaluated_attribute(Curves *curves,
                                                         const char *name,
                                                         bool *r_is_point_domain)
 {
@@ -715,10 +667,10 @@ GPUTexture **DRW_curves_texture_for_evaluated_attribute(Curves *curves,
   switch (final_cache.attr_used.requests[request_i].domain) {
     case ATTR_DOMAIN_POINT:
       *r_is_point_domain = true;
-      return &final_cache.attributes_tex[request_i];
+      return &final_cache.attributes_buf[request_i];
     case ATTR_DOMAIN_CURVE:
       *r_is_point_domain = false;
-      return &cache.curves_cache.proc_attributes_tex[request_i];
+      return &cache.curves_cache.proc_attributes_buf[request_i];
     default:
       BLI_assert_unreachable();
       return nullptr;
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index 9c1784b1de2..8facea4333f 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -173,13 +173,9 @@ static void particle_batch_cache_clear_hair(ParticleHairCache *hair_cache)
   /* TODO: more granular update tagging. */
   GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_point_buf);
   GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_length_buf);
-  DRW_TEXTURE_FREE_SAFE(hair_cache->point_tex);
-  DRW_TEXTURE_FREE_SAFE(hair_cache->length_tex);
 
   GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_strand_buf);
   GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_strand_seg_buf);
-  DRW_TEXTURE_FREE_SAFE(hair_cache->strand_tex);
-  DRW_TEXTURE_FREE_SAFE(hair_cache->strand_seg_tex);
 
   for (int i = 0; i < MAX_MTFACE; i++) {
     GPU_VERTBUF_DISCARD_SAFE(hair_cache->proc_uv_buf[i]);
@@ -192,7 +188,6 @@ static void particle_batch_cache_clear_hair(ParticleHairCache *hair_cache)
 
   for (int i = 0; i < MAX_HAIR_SUBDIV; i++) {
     GPU_VERTBUF_DISCARD_SAFE(hair_cache->final[i].proc_buf);
-    DRW_TEXTURE_FREE_SAFE(hair_cache->final[i].proc_tex);
     for (int j = 0; j < MAX_THICKRES; j++) {
       GPU_BATCH_DISCARD_SAFE(hair_cache->final[i].proc_hairs[j]);
     }
@@ -810,7 +805,7 @@ static int particle_batch_cache_fill_strands_data(ParticleSystem *psys,
 static void particle_batch_cache_ensure_procedural_final_points(ParticleHairCache *cache,
                                                                 int subdiv)
 {
-  /* Same format as point_tex. */
+  /* Same format as proc_point_buf. */
   GPUVertFormat format = {0};
   GPU_vertformat_attr_add(&format, "pos", GPU_COMP_F32, 4, GPU_FETCH_FLOAT);
 
@@ -823,12 +818,6 @@ static void particle_batch_cache_ensure_procedural_final_points(ParticleHairCach
   /* Those are points! not line segments. */
   GPU_vertbuf_data_alloc(cache->final[subdiv].proc_buf,
                          cache->final[subdiv].strands_res * cache->strands_len);
-
-  /* Create vbo immediately to bind to texture buffer. */
-  GPU_vertbuf_use(cache->final[subdiv].proc_buf);
-
-  cache->final[subdiv].proc_tex = GPU_texture_create_from_vertbuf("part_proc",
-                                                                  cache->final[subdiv].proc_buf);
 }
 
 static void particle_batch_cache_ensure_procedural_strand_data(PTCacheEdit *edit,
@@ -1034,14 +1023,6 @@ static void particle_batch_cache_ensure_procedural_strand_data(PTCacheEdit *edit
     MEM_freeN(parent_mcol);
   }
 
-  /* Create vbo immediately to bind to texture buffer. */
-  GPU_vertbuf_use(cache->proc_strand_buf);
-  cache->strand_tex = GPU_texture_create_from_vertbuf("part_strand", cache->proc_strand_buf);
-
-  GPU_vertbuf_use(cache->proc_strand_seg_buf);
-  cache->strand_seg_tex = GPU_texture_create_from_vertbuf("part_strand_seg",
-                                                          cache->proc_strand_seg_buf);
-
   for (int i = 0; i < cache->num_uv_layers; i++) {
     GPU_vertbuf_use(cache->proc_uv_buf[i]);
     cache->uv_tex[i] = GPU_texture_create_from_vertbuf("part_uv", cache->proc_uv_buf[i]);
@@ -1107,7 +1088,7 @@ static void particle_batch_cache_ensure_procedural_indices(PTCacheEdit *edit,
 static void particle_batch_cache_ensure_procedural_pos(PTCacheEdit *edit,
                                                        ParticleSystem *psys,
                                                        ParticleHairCache *cache,
-                                                       GPUMaterial *gpu_material)
+                                                       GPUMaterial *UNUSED(gpu_material))
 {
   if (cache->proc_point_buf == NULL) {
     /* initialize vertex format */
@@ -1149,22 +1130,6 @@ static void particle_batch_cache_ensure_procedural_pos(PTCacheEdit *edit,
             psys->childcache, child_count, &pos_step, &length_step);
       }
     }
-
-    /* Create vbo immediately to bind to texture buffer. */
-    GPU_vertbuf_use(cache->proc_point_buf);
-    cache->point_tex = GPU_texture_create_from_vertbuf("part_point", cache->proc_point_buf);
-  }
-
-  /* Checking hair length separately, only allocating gpu memory when needed. */
-  if (gpu_material && cache->proc_length_buf != NULL && cache->length_tex == NULL) {
-    ListBase gpu_attrs = GPU_material_attributes(gpu_material);
-    LISTBASE_FOREACH (GPUMaterialAttribute *, attr, &gpu_attrs) {
-      if (attr->type == CD_HAIRLENGTH) {
-        GPU_vertbuf_use(cache->proc_length_buf);
-        cache->length_tex = GPU_texture_create_from_vertbuf("hair_length", cache->proc_length_buf);
-        break;
-      }
-    }
   }
 }
 
@@ -1722,7 +1687,7 @@ bool particles_ensure_procedural_data(Object *object,
 
   /* Refreshed on combing and simulation. */
   if ((*r_hair_cache)->proc_point_buf == NULL ||
-      (gpu_material && (*r_hair_cache)->length_tex == NULL)) {
+      (gpu_material && (*r_hair_cache)->proc_length_buf == NULL)) {
     ensure_seg_pt_count(source.edit, source.psys, &cache->hair);
     particle_batch_cache_ensure_procedural_pos(
         source.edit, source.psys, &cache->hair, gpu_material);
@@ -1730,7 +1695,7 @@ bool particles_ensure_procedural_data(Object *object,
   }
 
   /* Refreshed if active layer or custom data changes. */
-  if ((*r_hair_cache)->strand_tex == NULL) {
+  if ((*r_hair_cache)->proc_strand_buf == NULL) {
     particle_batch_cache_ensure_procedural_strand_data(
         source.edit, source.psys, source.md, &cache->hair);
   }
diff --git a/source/blender/draw/intern/draw_curves.cc b/source/blender/draw/intern/draw_curves.cc
index 8847e3f6016..ee9045696be 100644
--- a/source/blender/draw/intern/draw_curves.cc
+++ b/source/blender/draw/intern/draw_curves.cc
@@ -129,25 +129,25 @@ void DRW_curves_ubos_pool_free(CurvesUniformBufPool *pool)
 
 static void drw_curves_cache_shgrp_attach_resources(DRWShadingGroup *shgrp,
                                                     CurvesEvalCache *cache,
-                                                    GPUTexture *tex,
+                                                    GPUVertBuf *point_buf,
                                                     const int subdiv)
 {
-  DRW_shgroup_uniform_texture(shgrp, "hairPointBuffer", tex);
-  DRW_shgroup_uniform_texture(shgrp, "hairStrandBuffer", cache->strand_tex);
-  DRW_shgroup_uniform_texture(shgrp, "hairStrandSegBuffer", cache->strand_seg_tex);
+  DRW_shgroup_buffer_texture(shgrp, "hairPointBuffer", point_buf);
+  DRW_shgroup_buffer_texture(shgrp, "hairStrandBuffer", cache->proc_strand_buf);
+  DRW_shgroup_buffer_texture(shgrp, "hairStrandSegBuffer", cache->proc_strand_seg_buf);
   DRW_shgroup_uniform_int(shgrp, "hairStrandsRes", &cache->final[subdiv].strands_res, 1);
 }
 
 static void drw_curves_cache_update_compute(CurvesEvalCache *cache,
                                             const int subdiv,
                                             const int strands_len,
-                                            GPUVertBuf *buffer,
-                                            GPUTexture *tex)
+                                            GPUVertBuf *output_buf,
+                                            GPUVertBuf *input_buf)
 {
   GPUShader *shader = curves_eval_shader_get(CURVES_EVAL_CATMULL_ROM);
   DRWShadingGroup *shgrp = DRW_shgroup_create(shader, g_tf_pass);
-  drw_curves_cache_shgrp_attach_resources(shgrp, cache, tex, subdiv);
-  DRW_shgroup_vertex_buffer(shgrp, "posTime", buffer);
+  drw_curves_cache_shgrp_attach_resources(shgrp, cache, input_buf, subdiv);
+  DRW_shgroup_vertex_buffer(shgrp, "posTime", output_buf);
 
   const int max_strands_per_call = GPU_max_work_group_count(0);
   int strands_start = 0;
@@ -169,7 +169,7 @@ static void drw_curves_cache_update_compute(CurvesEvalCache *cache, const int su
   }
 
   drw_curves_cache_update_compute(
-      cache, subdiv, strands_len, cache->final[subdiv].proc_buf, cache->point_tex);
+      cache, subdiv, strands_len, cache->final[subdiv].proc_buf, cache->proc_point_buf);
 
   const DRW_Attributes &attrs = cache->final[subdiv].attr_used;
   for (int i = 0; i < attrs.num_requests; i++) {
@@ -182,13 +182,13 @@ static void drw_curves_cache_update_compute(CurvesEvalCache *cache, const int su
                                     subdiv,
                                     strands_len,
                                     cache->final[subdiv].attributes_buf[i],
-                                    cache->proc_attributes_tex[i]);
+                                    cache->proc_attributes_buf[i]);
   }
 }
 
 static void drw_curves_cache_update_transform_feedback(CurvesEvalCache *cache,
-                                                       GPUVertBuf *vbo,
-                                                       GPUTexture *tex,
+                                                       GPUVertBuf *output_buf,
+                                                       GPUVertBuf *input_buf,
                                                        const int subdiv,
                                                        const int final_points_len)
 {
@@ -196,14 +196,14 @@ static void drw_curves_cache_update_transform_feedback(CurvesEvalCache *cache,
 
   DRWShadingGroup *tf_shgrp = nullptr;
   if (GPU_transform_feedback_support()) {
-    tf_shgrp = DRW_shgroup_transform_feedback_create(tf_shader, g_tf_pass, vbo);
+    tf_shgrp = DRW_shgroup_transform_feedback_create(tf_shader, g_tf_pass, output_buf);
   }
   else {
     tf_shgrp = DRW_shgroup_create(tf_shader, g_tf_pass);
 
     CurvesEvalCall *pr_call = MEM_new<CurvesEvalCall>(__func__);
     pr_call->next = g_tf_calls;
-    pr_call->vbo = vbo;
+    pr_call->vbo = output_buf;
     pr_call->shgrp = tf_shgrp;
     pr_call->vert_len = final_points_len;
     g_tf_calls = pr_call;
@@ -213,7 +213,7 @@ static void drw_curves_cache_update_transform_feedback(CurvesEvalCache *cache,
   }
   BLI_assert(tf_shgrp != nullptr);
 
-  drw_curves_cache_shgrp_attach_resources(tf_shgrp, cache, tex, subdiv);
+  drw_curves_cache_shgrp_attach_resources(tf_shgrp, cache, input_buf, subdiv);
   DRW_shgroup_call_procedural_points(tf_shgrp, nullptr, final_points_len);
 }
 
@@ -225,7 +225,7 @@ static void drw_curves_cache_update_transform_feedback(CurvesEvalCache *cache, c
   }
 
   drw_curves_cache_update_transform_feedback(
-      cache, cache->final[subdiv].proc_buf, cache->point_tex, subdiv, final_points_len);
+      cache, cache->final[subdiv].proc_buf, cache->proc_point_buf, subdiv, final_points_len);
 
   const DRW_Attributes &attrs = cache->final[subdiv].attr_used;
   for (int i = 0; i < attrs.num_requests; i++) {
@@ -236,7 +236,7 @@ static void drw_curves_cache_update_transform_feedback(CurvesEvalCache *cache, c
 
     drw_curves_cache_update_transform_feedback(cache,
                                                cache->final[subdiv].attributes_buf[i],
-                                               cache->proc_attributes_tex[i],
+                                               cache->proc_attributes_buf[i],
                                                subdiv,
                                                final_points_len);
   }
@@ -346,9 +346,9 @@ DRWShadingGroup *DRW_shgroup_curves_create_sub(Object *object,
         1.0f);
   }
 
-  DRW_shgroup_uniform_texture(shgrp, "hairPointBuffer", curves_cache->final[subdiv].proc_tex);
-  if (curves_cache->length_tex) {
-    DRW_shgroup_uniform_texture(shgrp, "hairLen", curves_cache->length_tex);
+  DRW_shgroup_buffer_texture(shgrp, "hairPointBuffer", curves_cache->final[subdiv].proc_buf);
+  if (curves_cache->proc_length_buf) {
+    DRW_shgroup_buffer_texture(shgrp, "hairLen", curves_cache->proc_length_buf);
   }
 
   const DRW_Attributes &attrs = curves_cache->final[subdiv].attr_used;
@@ -359,18 +359,18 @@ DRWShadingGroup *DRW_shgroup_curves_create_sub(Object *object,
     drw_curves_get_attribute_sampler_name(request.attribute_name, sampler_name);
 
     if (request.domain == ATTR_DOMAIN_CURVE) {
-      if (!curves_cache->proc_attributes_tex[i]) {
+      if (!curves_cache->proc_attributes_buf[i]) {
         continue;
       }
 
-      DRW_shgroup_uniform_texture(shgrp, sampler_name, curves_cache->proc_attributes_tex[i]);
+      DRW_shgroup_buffer_texture(shgrp, sampler_name, curves_cache->proc_attributes_buf[i]);
     }
     else {
-      if (!curves_cache->final[subdiv].attributes_tex[i]) {
+      if (!curves_cache->final[subdiv].attributes_buf[i]) {
         continue;
       }
-      DRW_shgroup_uniform_texture(
-          shgrp, sampler_name, curves_cache->final[subdiv].attributes_tex[i]);
+      DRW_shgroup_buffer_texture(
+          shgrp, sampler_name, curves_cache->final[subdiv].attributes_buf[i]);
     }
 
     /* Some attributes may not be used in the shader anymore and were not garbage collected yet, so
diff --git a/source/blender/draw/intern/draw_curves_private.h b/source/blender/draw/intern/draw_curves_private.h
index a74878ec674..715706fd7a6 100644
--- a/source/blender/draw/intern/draw_curves_private.h
+++ b/source/blender/draw/intern/draw_curves_private.h
@@ -34,7 +34,6 @@ typedef enum CurvesEvalShader {
 typedef struct CurvesEvalFinalCache {
   /* Output of the subdivision stage: vertex buffer sized to subdiv level. */
   GPUVertBuf *proc_buf;
-  GPUTexture *proc_tex;
 
   /** Just contains a huge index buffer used to draw the final curves. */
   GPUBatch *proc_hairs[MAX_THICKRES];
@@ -61,35 +60,29 @@ typedef struct CurvesEvalFinalCache {
   /* Output of the subdivision stage: vertex buffers sized to subdiv level. This is only attributes
    * on point domain. */
   GPUVertBuf *attributes_buf[GPU_MAX_ATTR];
-  GPUTexture *attributes_tex[GPU_MAX_ATTR];
 } CurvesEvalFinalCache;
 
 /* Curves procedural display: Evaluation is done on the GPU. */
 typedef struct CurvesEvalCache {
   /* Input control point positions combined with parameter data. */
   GPUVertBuf *proc_point_buf;
-  GPUTexture *point_tex;
 
   /* Editmode data (such as selection flags) used by overlay_edit_curve_point.glsl */
   GPUVertBuf *data_edit_points;
 
   /** Info of control points strands (segment count and base index) */
   GPUVertBuf *proc_strand_buf;
-  GPUTexture *strand_tex;
 
   /* Curve length data. */
   GPUVertBuf *proc_length_buf;
-  GPUTexture *length_tex;
 
   GPUVertBuf *proc_strand_seg_buf;
-  GPUTexture *strand_seg_tex;
 
   CurvesEvalFinalCache final[MAX_HAIR_SUBDIV];
 
   /* For point attributes, which need subdivision, these buffers contain the input data.
    * For curve domain attributes, which do not need subdivision, these are the final data. */
   GPUVertBuf *proc_attributes_buf[GPU_MAX_ATTR];
-  GPUTexture *proc_attributes_tex[GPU_MAX_ATTR];
 
   int strands_len;
   int elems_len;
diff --git a/source/blender/draw/intern/draw_hair.cc b/source/blender/draw/intern/draw_hair.cc
index 281e58ea230..08e5d780cba 100644
--- a/source/blender/draw/intern/draw_hair.cc
+++ b/source/blender/draw/intern/draw_hair.cc
@@ -105,9 +105,9 @@ static void drw_hair_particle_cache_shgrp_attach_resources(DRWShadingGroup *shgr
                                                            ParticleHairCache *cache,
                                                            const int subdiv)
 {
-  DRW_shgroup_uniform_texture(shgrp, "hairPointBuffer", cache->point_tex);
-  DRW_shgroup_uniform_texture(shgrp, "hairStrandBuffer", cache->strand_tex);
-  DRW_shgroup_uniform_texture(shgrp, "hairStrandSegBuffer", cache->strand_seg_tex);
+  DRW_shgroup_buffer_texture(shgrp, "hairPointBuffer", cache->proc_point_buf);
+  DRW_shgroup_buffer_texture(shgrp, "hairStrandBuffer", cache->proc_strand_buf);
+  DRW_shgroup_buffer_texture(shgrp, "hairStrandSegBuffer", cache->proc_strand_seg_buf);
   DRW_shgroup_uniform_int(shgrp, "hairStrandsRes", &cache->final[subdiv].strands_res, 1);
 }
 
@@ -280,9 +280,9 @@ DRWShadingGroup *DRW_shgroup_hair_create_sub(Object *object,
   float hair_rad_tip = part->rad_tip * part->rad_scale * 0.5f;
   bool hair_close_tip = (part->shape_flag & PART_SHAPE_CLOSE_TIP) != 0;
 
-  DRW_shgroup_uniform_texture(shgrp, "hairPointBuffer", hair_cache->final[subdiv].proc_tex);
-  if (hair_cache->length_tex) {
-    DRW_shgroup_uniform_texture(shgrp, "l", hair_cache->length_tex);
+  DRW_shgroup_buffer_texture(shgrp, "hairPointBuffer", hair_cache->final[subdiv].proc_buf);
+  if (hair_cache->proc_length_buf) {
+    DRW_shgroup_buffer_texture(shgrp, "l", hair_cache->proc_length_buf);
   }
 
   DRW_shgroup_uniform_block(shgrp, "drw_curves", *g_dummy_curves_info);
diff --git a/source/blender/draw/intern/draw_hair_private.h b/source/blender/draw/intern/draw_hair_private.h
index c7e9e1e22de..a3019ab5aa5 100644
--- a/source/blender/draw/intern/draw_hair_private.h
+++ b/source/blender/draw/intern/draw_hair_private.h
@@ -29,7 +29,6 @@ struct ParticleSystem;
 typedef struct ParticleHairFinalCache {
   /* Output of the subdivision stage: vertex buff sized to subdiv level. */
   GPUVertBuf *proc_buf;
-  GPUTexture *proc_tex;
 
   /* Just contains a huge index buffer used to draw the final hair. */
   GPUBatch *proc_hairs[MAX_THICKRES];
@@ -44,18 +43,14 @@ typedef struct ParticleHairCache {
 
   /* Hair Procedural display: Interpolation is done on the GPU. */
   GPUVertBuf *proc_point_buf; /* Input control points */
-  GPUTexture *point_tex;
 
   /** Infos of control points strands (segment count and base index) */
   GPUVertBuf *proc_strand_buf;
-  GPUTexture *strand_tex;
 
   /* Hair Length */
   GPUVertBuf *proc_length_buf;
-  GPUTexture *length_tex;
 
   GPUVertBuf *proc_strand_seg_buf;
-  GPUTexture *strand_seg_tex;
 
   GPUVertBuf *proc_uv_buf[MAX_MTFACE];
   GPUTexture *uv_tex[MAX_MTFACE];
diff --git a/source/blender/draw/intern/draw_pointcloud.cc b/source/blender/draw/intern/draw_pointcloud.cc
index cf46e53129a..582dc690cee 100644
--- a/source/blender/draw/intern/draw_pointcloud.cc
+++ b/source/blender/draw/intern/draw_pointcloud.cc
@@ -80,7 +80,7 @@ DRWShadingGroup *DRW_shgroup_pointcloud_create_sub(Object *object,
     //   drw_curves_get_attribute_sampler_name(request.attribute_name, sampler_name);
 
     //   GPUTexture *attribute_buf = DRW_pointcloud_evaluated_attribute(&pointcloud);
-    //   if (!cache->attributes_tex[i]) {
+    //   if (!cache->attributes_buf[i]) {
     //     continue;
     //   }
     //   DRW_shgroup_buffer_texture_ref(shgrp, sampler_name, attribute_buf);