Merge branch 'master' into refactor-mesh-position-genericrefactor-mesh-position-generic

1 files changed, 9 insertions, 2 deletions

diff --git a/source/blender/compositor/realtime_compositor/COM_context.hh b/source/blender/compositor/realtime_compositor/COM_context.hh
index b5c8cea641f..80fb4f70ca4 100644
--- a/source/blender/compositor/realtime_compositor/COM_context.hh
+++ b/source/blender/compositor/realtime_compositor/COM_context.hh
@@ -9,6 +9,7 @@
 
 #include "GPU_texture.h"
 
+#include "COM_static_cache_manager.hh"
 #include "COM_static_shader_manager.hh"
 #include "COM_texture_pool.hh"
 
@@ -22,14 +23,17 @@ namespace blender::realtime_compositor {
  * providing input data like render passes and the active scene, as well as references to the data
  * where the output of the evaluator will be written. The class also provides a reference to the
  * texture pool which should be implemented by the caller and provided during construction.
- * Finally, the class have an instance of a static shader manager for convenient shader
- * acquisition. */
+ * Finally, the class have an instance of a static shader manager and a static resource manager
+ * for acquiring cached shaders and resources efficiently. */
 class Context {
  private:
   /* A texture pool that can be used to allocate textures for the compositor efficiently. */
   TexturePool &texture_pool_;
   /* A static shader manager that can be used to acquire shaders for the compositor efficiently. */
   StaticShaderManager shader_manager_;
+  /* A static cache manager that can be used to acquire cached resources for the compositor
+   * efficiently. */
+  StaticCacheManager cache_manager_;
 
  public:
   Context(TexturePool &texture_pool);
@@ -67,6 +71,9 @@ class Context {
 
   /* Get a reference to the static shader manager of this context. */
   StaticShaderManager &shader_manager();
+
+  /* Get a reference to the static cache manager of this context. */
+  StaticCacheManager &cache_manager();
 };
 
 }  // namespace blender::realtime_compositor