From afdbef449b17753b8a28da568ea79add9db02aef Mon Sep 17 00:00:00 2001
From: Omar Emara <mail@OmarEmara.dev>
Date: Thu, 21 Nov 2024 16:26:49 +0200
Subject: [PATCH] Cleanup: Compositor: Remove redundant includes

---
 .../cached_resources/COM_bokeh_kernel.hh                 | 3 ---
 .../cached_resources/COM_cached_mask.hh                  | 2 --
 .../cached_resources/COM_cached_texture.hh               | 6 ------
 .../cached_resources/COM_distortion_grid.hh              | 9 +++------
 .../cached_resources/COM_keying_screen.hh                | 7 ++-----
 .../cached_resources/intern/cached_image.cc              | 1 -
 6 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh
index 0873e12b9ec..171a48dd522 100644
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_bokeh_kernel.hh
@@ -10,9 +10,6 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
 
-#include "GPU_shader.hh"
-#include "GPU_texture.hh"
-
 #include "COM_cached_resource.hh"
 #include "COM_result.hh"
 
diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh
index 8cc79f03409..7aedf3c046a 100644
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_mask.hh
@@ -11,8 +11,6 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
 
-#include "GPU_texture.hh"
-
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 
diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh
index 0792cee285e..74286639663 100644
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_cached_texture.hh
@@ -11,8 +11,6 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
 
-#include "GPU_texture.hh"
-
 #include "DNA_texture_types.h"
 
 #include "COM_cached_resource.hh"
@@ -61,10 +59,6 @@ class CachedTexture : public CachedResource {
                 float3 scale);
 
   ~CachedTexture();
-
-  GPUTexture *color_texture();
-
-  GPUTexture *value_texture();
 };
 
 /* ------------------------------------------------------------------------------------------------
diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh
index 0c11bac2594..8d48b629664 100644
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_distortion_grid.hh
@@ -11,9 +11,6 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
 
-#include "GPU_shader.hh"
-#include "GPU_texture.hh"
-
 #include "DNA_movieclip_types.h"
 
 #include "COM_cached_resource.hh"
@@ -51,9 +48,9 @@ bool operator==(const DistortionGridKey &a, const DistortionGridKey &b);
 /* -------------------------------------------------------------------------------------------------
  * Distortion Grid.
  *
- * A cached resource that computes and caches a GPU texture containing the normalized coordinates
- * after applying the camera distortion of a given movie clip tracking camera. See the constructor
- * for more information. */
+ * A cached resource that computes and caches a result containing the normalized coordinates after
+ * applying the camera distortion of a given movie clip tracking camera. See the constructor for
+ * more information. */
 class DistortionGrid : public CachedResource {
  private:
   Array<float2> distortion_grid_;
diff --git a/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh b/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh
index f5141d7cbb6..5fe253628c7 100644
--- a/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh
+++ b/source/blender/compositor/realtime_compositor/cached_resources/COM_keying_screen.hh
@@ -11,9 +11,6 @@
 #include "BLI_map.hh"
 #include "BLI_math_vector_types.hh"
 
-#include "GPU_shader.hh"
-#include "GPU_texture.hh"
-
 #include "DNA_movieclip_types.h"
 #include "DNA_tracking_types.h"
 
@@ -42,8 +39,8 @@ bool operator==(const KeyingScreenKey &a, const KeyingScreenKey &b);
 /* -------------------------------------------------------------------------------------------------
  * Keying Screen.
  *
- * A cached resource that computes and caches a GPU texture containing the keying screen computed
- * by interpolating the markers of the given movie tracking object in the given movie clip. */
+ * A cached resource that computes and caches a result containing the keying screen computed by
+ * interpolating the markers of the given movie tracking object in the given movie clip. */
 class KeyingScreen : public CachedResource {
  public:
   Result result;
diff --git a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc
index 8947066967e..2de5c2462de 100644
--- a/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc
+++ b/source/blender/compositor/realtime_compositor/cached_resources/intern/cached_image.cc
@@ -12,7 +12,6 @@
 
 #include "RE_pipeline.h"
 
-#include "GPU_shader.hh"
 #include "GPU_texture.hh"
 
 #include "IMB_colormanagement.hh"