From bab8f2f976fa49ee216919ef1ccbc2cf65391101 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 24 Sep 2024 11:28:45 +0200 Subject: [PATCH 1/4] Revert "dmabuf: Use the ngl downloader" This reverts commit 97e0f872a2a577244faa81efad619c26be56717f. --- gdk/gdkdmabufegl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gdk/gdkdmabufegl.c b/gdk/gdkdmabufegl.c index 9e53519eb2..f6358c04cd 100644 --- a/gdk/gdkdmabufegl.c +++ b/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)) { From 67cec180cad0d71e1f735ef4e653ef1a8e7f205f Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 24 Sep 2024 11:29:03 +0200 Subject: [PATCH 2/4] Revert "gsk: Make downloaders work fully" This reverts commit de74fa083627e2df190556d79d27da80a6fdff61. --- gsk/gpu/gskgpuframe.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/gsk/gpu/gskgpuframe.c b/gsk/gpu/gskgpuframe.c index 563f153f6d..28e27f0acd 100644 --- a/gsk/gpu/gskgpuframe.c +++ b/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); } From 617297ddd70940d31dd152dbf8b78d29c67c7a17 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 24 Sep 2024 11:29:25 +0200 Subject: [PATCH 3/4] Revert "gpu: Make gsk_gpu_copy_image available" This reverts commit 42d26720d65bf0a83f84cac17b0043824f083142. --- gsk/gpu/gskgpunodeprocessor.c | 4 ++-- gsk/gpu/gskgpunodeprocessorprivate.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/gsk/gpu/gskgpunodeprocessor.c b/gsk/gpu/gskgpunodeprocessor.c index 5558199940..49702a7762 100644 --- a/gsk/gpu/gskgpunodeprocessor.c +++ b/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, diff --git a/gsk/gpu/gskgpunodeprocessorprivate.h b/gsk/gpu/gskgpunodeprocessorprivate.h index 69ee7a0ec9..26bde2f266 100644 --- a/gsk/gpu/gskgpunodeprocessorprivate.h +++ b/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 From 0929d77f7faea9827477366b8d7ef756fc906bd0 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 24 Sep 2024 11:29:41 +0200 Subject: [PATCH 4/4] Revert "Fix the ngl downloader" This reverts commit c7dfb8cb5558c4a0d23e1e74b3b48f6b94e78a71. --- gsk/gpu/gskgpudownloadop.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gsk/gpu/gskgpudownloadop.c b/gsk/gpu/gskgpudownloadop.c index 368956a4ea..b81732eb71 100644 --- a/gsk/gpu/gskgpudownloadop.c +++ b/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;