[Bf-blender-cvs] [6299c3e99ce] temp-pbvh-vbos: Merge remote-tracking branch 'origin' into temp-pbvh-vbos

[Joseph Eagar]

Commit: 6299c3e99ce64f5894e67d9255b1a39161376627
Author: Joseph Eagar
Date:   Sun Sep 4 17:06:50 2022 -0700
Branches: temp-pbvh-vbos
https://developer.blender.org/rB6299c3e99ce64f5894e67d9255b1a39161376627

Merge remote-tracking branch 'origin' into temp-pbvh-vbos

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



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

diff --cc source/blender/draw/CMakeLists.txt
index c583c05c5cf,f0c0a435e2a..3ddabeed4e6
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -92,7 -92,8 +92,9 @@@ set(SR
    intern/draw_manager_shader.c
    intern/draw_manager_text.c
    intern/draw_manager_texture.c
 +  intern/draw_pbvh.cc
+   intern/draw_manager.c
+   intern/draw_manager.cc
    intern/draw_select_buffer.c
    intern/draw_shader.cc
    intern/draw_texture_pool.cc
@@@ -222,14 -224,18 +225,19 @@@
    intern/draw_manager_profiling.h
    intern/draw_manager_testing.h
    intern/draw_manager_text.h
 +  intern/draw_pbvh.h
-   intern/draw_shader.h
+   intern/draw_manager.h
+   intern/draw_manager.hh
+   intern/draw_pass.hh
+   intern/draw_resource.cc
+   intern/draw_resource.hh
    intern/draw_shader_shared.h
+   intern/draw_shader.h
    intern/draw_subdivision.h
    intern/draw_texture_pool.h
-   intern/draw_view.h
    intern/draw_view_data.h
+   intern/draw_view.cc
+   intern/draw_view.h
    intern/mesh_extractors/extract_mesh.hh
    intern/smaa_textures.h
    engines/basic/basic_engine.h
diff --cc source/blender/draw/intern/draw_manager.h
index 905b9e5929d,4f71e665390..67d0f79b83e
--- a/source/blender/draw/intern/draw_manager.h
+++ b/source/blender/draw/intern/draw_manager.h
@@@ -694,15 -694,9 +694,19 @@@ bool drw_engine_data_engines_data_valid
  void drw_engine_data_cache_release(GPUViewport *viewport);
  void drw_engine_data_free(GPUViewport *viewport);
  
 +struct DRW_Attributes;
 +struct DRW_MeshCDMask;
 +struct GPUMaterial;
 +void DRW_mesh_get_attributes(struct Object *object,
 +                             struct Mesh *me,
 +                             struct GPUMaterial **gpumat_array,
 +                             int gpumat_array_len,
 +                             struct DRW_Attributes *r_attrs,
 +                             struct DRW_MeshCDMask *r_cd_needed);
++
+ void DRW_manager_begin_sync(void);
+ void DRW_manager_end_sync(void);
+ 
  #ifdef __cplusplus
  }
  #endif