Merge branch 'wip/otte/for-main' into 'main'

Revert "dmabuf: Use the ngl downloader"

See merge request GNOME/gtk!7734

gdk/gdkdmabufegl.c

@@ -229,7 +229,6 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
 typedef struct _GskRenderer GskRenderer;
 
 extern GskRenderer *   gsk_gl_renderer_new                      (void);
-extern GskRenderer *   gsk_ngl_renderer_new                     (void);
 extern gboolean        gsk_renderer_realize_for_display         (GskRenderer  *renderer,
                                                                  GdkDisplay   *display,
                                                                  GError      **error);
@@ -273,7 +272,7 @@ gdk_dmabuf_egl_init (GdkDisplay *display)
       return;
     }
 
-  renderer = gsk_ngl_renderer_new ();
+  renderer = gsk_gl_renderer_new ();
 
   if (!gsk_renderer_realize_for_display (renderer, display, &error))
     {

gsk/gpu/gskgpudownloadop.c

@@ -358,6 +358,9 @@ gsk_gpu_download_op_gl_command (GskGpuOp          *op,
                                                 gsk_gl_texture_data_free,
                                                 data);
 
+  gsk_gpu_image_toggle_ref_texture (self->image, self->texture);
+  gsk_gl_image_steal_texture_ownership (GSK_GL_IMAGE (self->image));
+
   g_object_unref (builder);
 
   return op->next;

gsk/gpu/gskgpuframe.c

@@ -11,19 +11,13 @@
 #include "gskgpuopprivate.h"
 #include "gskgpurendererprivate.h"
 #include "gskgpuuploadopprivate.h"
-#include "gskgpurenderpassopprivate.h"
-#include "gskgputextureopprivate.h"
-#include "gskgpuconvertopprivate.h"
-#include "gskgpuconvertcicpopprivate.h"
 
 #include "gskdebugprivate.h"
 #include "gskrendererprivate.h"
-#include "gskrendernodeprivate.h"
 
 #include "gdk/gdkdmabufdownloaderprivate.h"
 #include "gdk/gdkdrawcontextprivate.h"
 #include "gdk/gdktexturedownloaderprivate.h"
-#include "gdk/gdktextureprivate.h"
 
 #define DEFAULT_VERTEX_BUFFER_SIZE 128 * 1024
 
@@ -767,7 +761,6 @@ gsk_gpu_frame_download_texture (GskGpuFrame     *self,
 {
   GskGpuFramePrivate *priv = gsk_gpu_frame_get_instance_private (self);
   GskGpuImage *image;
-  GdkColorState *texture_color_state;
 
   priv->timestamp = timestamp;
   gsk_gpu_cache_set_time (gsk_gpu_device_get_cache (priv->device), timestamp);
@@ -783,14 +776,6 @@ gsk_gpu_frame_download_texture (GskGpuFrame     *self,
 
   gsk_gpu_frame_cleanup (self);
 
-  texture_color_state = gdk_texture_get_color_state (texture);
-
-  if (format != gdk_texture_get_format (texture) ||
-      !gdk_color_state_equal (color_state, texture_color_state))
-    {
-      image = gsk_gpu_copy_image (self, color_state, image, texture_color_state, FALSE);
-    }
-
   gsk_gpu_download_op (self,
                        image,
                        FALSE,
@@ -803,6 +788,5 @@ gsk_gpu_frame_download_texture (GskGpuFrame     *self,
                        }, sizeof (Download)));
 
   gsk_gpu_frame_submit (self, GSK_RENDER_PASS_EXPORT);
-
   g_object_unref (image);
 }

gsk/gpu/gskgpunodeprocessor.c

@@ -683,7 +683,7 @@ gsk_gpu_get_node_as_image_via_offscreen (GskGpuFrame           *frame,
 }
 
 /*
- * gsk_gpu_copy_image:
+ * gsk_gpu_node_copy_image:
  * @frame: The frame the image will be copied in
  * @ccs: color state the copy will be in
  * @image: (transfer full): The image to copy
@@ -695,7 +695,7 @@ gsk_gpu_get_node_as_image_via_offscreen (GskGpuFrame           *frame,
  *
  * Returns: (transfer full): The copy of the image.
  **/
-GskGpuImage *
+static GskGpuImage *
 gsk_gpu_copy_image (GskGpuFrame   *frame,
                     GdkColorState *ccs,
                     GskGpuImage   *image,

gsk/gpu/gskgpunodeprocessorprivate.h

@@ -13,10 +13,4 @@ void                    gsk_gpu_node_processor_process                  (GskGpuF
                                                                          const graphene_rect_t          *viewport,
                                                                          GskRenderPassType               pass_type);
 
-GskGpuImage * gsk_gpu_copy_image (GskGpuFrame   *frame,
-                                  GdkColorState *ccs,
-                                  GskGpuImage   *image,
-                                  GdkColorState *image_cs,
-                                  gboolean       prepare_mipmap);
-
 G_END_DECLS