diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c
index 87edc24602..fdf00f3f21 100644
--- a/gsk/vulkan/gskvulkancolormatrixop.c
+++ b/gsk/vulkan/gskvulkancolormatrixop.c
@@ -91,12 +91,12 @@ gsk_vulkan_color_matrix_op_reserve_descriptor_sets (GskVulkanOp     *op,
   self->sampler_descriptor = gsk_vulkan_render_get_sampler_descriptor (render, GSK_VULKAN_SAMPLER_DEFAULT);
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_color_matrix_op_get_pipeline (GskVulkanOp *op)
 {
   GskVulkanColorMatrixOp *self = (GskVulkanColorMatrixOp *) op;
 
-  return self->pipeline;
+  return gsk_vulkan_pipeline_get_pipeline (self->pipeline);
 }
 
 static void
diff --git a/gsk/vulkan/gskvulkanoffscreenop.c b/gsk/vulkan/gskvulkanoffscreenop.c
index 2b5c982dd8..8bf4e7181d 100644
--- a/gsk/vulkan/gskvulkanoffscreenop.c
+++ b/gsk/vulkan/gskvulkanoffscreenop.c
@@ -62,7 +62,7 @@ gsk_vulkan_offscreen_op_reserve_descriptor_sets (GskVulkanOp     *op,
   gsk_vulkan_render_pass_reserve_descriptor_sets (self->render_pass, render);
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_offscreen_op_get_pipeline (GskVulkanOp *op)
 {
   return NULL;
diff --git a/gsk/vulkan/gskvulkanop.c b/gsk/vulkan/gskvulkanop.c
index e4fc3018bb..d0e38fad77 100644
--- a/gsk/vulkan/gskvulkanop.c
+++ b/gsk/vulkan/gskvulkanop.c
@@ -49,7 +49,7 @@ gsk_vulkan_op_reserve_descriptor_sets (GskVulkanOp     *op,
   op->op_class->reserve_descriptor_sets (op, render);
 }
 
-GskVulkanPipeline *
+VkPipeline
 gsk_vulkan_op_get_pipeline (GskVulkanOp *op)
 {
   return op->op_class->get_pipeline (op);
diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h
index 4673e34d16..f99a90a217 100644
--- a/gsk/vulkan/gskvulkanopprivate.h
+++ b/gsk/vulkan/gskvulkanopprivate.h
@@ -34,7 +34,7 @@ struct _GskVulkanOpClass
                                                                          guchar                 *data);
   void                  (* reserve_descriptor_sets)                     (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render);
-  GskVulkanPipeline *   (* get_pipeline)                                (GskVulkanOp            *op);
+  VkPipeline            (* get_pipeline)                                (GskVulkanOp            *op);
   void                  (* command)                                     (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render,
                                                                          VkPipelineLayout        pipeline_layout,
@@ -62,7 +62,7 @@ void                    gsk_vulkan_op_collect_vertex_data               (GskVulk
                                                                          guchar                 *data);
 void                    gsk_vulkan_op_reserve_descriptor_sets           (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render);
-GskVulkanPipeline *     gsk_vulkan_op_get_pipeline                      (GskVulkanOp            *op);
+VkPipeline              gsk_vulkan_op_get_pipeline                      (GskVulkanOp            *op);
 void                    gsk_vulkan_op_command                           (GskVulkanOp            *op,
                                                                          GskVulkanRender        *render,
                                                                          VkPipelineLayout        pipeline_layout,
diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 41935505f2..9ef656eaef 100644
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -2141,8 +2141,8 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass     *self,
                                   VkPipelineLayout         pipeline_layout,
                                   VkCommandBuffer          command_buffer)
 {
-  GskVulkanPipeline *current_pipeline = NULL;
-  GskVulkanPipeline *op_pipeline;
+  VkPipeline current_pipeline = VK_NULL_HANDLE;
+  VkPipeline op_pipeline;
   GskVulkanOp *op;
   guint i;
   GskVulkanBuffer *vertex_buffer;
@@ -2168,14 +2168,14 @@ gsk_vulkan_render_pass_draw_rect (GskVulkanRenderPass     *self,
           current_pipeline = op_pipeline;
           vkCmdBindPipeline (command_buffer,
                              VK_PIPELINE_BIND_POINT_GRAPHICS,
-                             gsk_vulkan_pipeline_get_pipeline (current_pipeline));
+                             current_pipeline);
         }
 
       gsk_vulkan_op_command (op, render, pipeline_layout, command_buffer);
     }
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_render_op_get_pipeline (GskVulkanOp *op_)
 {
   GskVulkanOpAll *op = (GskVulkanOpAll *) op_;
@@ -2190,11 +2190,11 @@ gsk_vulkan_render_op_get_pipeline (GskVulkanOp *op_)
     case GSK_VULKAN_OP_OUTSET_SHADOW:
     case GSK_VULKAN_OP_CROSS_FADE:
     case GSK_VULKAN_OP_BLEND_MODE:
-      return op->render.pipeline;
+      return gsk_vulkan_pipeline_get_pipeline (op->render.pipeline);
 
     case GSK_VULKAN_OP_TEXT:
     case GSK_VULKAN_OP_COLOR_TEXT:
-      return op->text.pipeline;
+      return gsk_vulkan_pipeline_get_pipeline (op->text.pipeline);
 
     case GSK_VULKAN_OP_PUSH_VERTEX_CONSTANTS:
       return NULL;
diff --git a/gsk/vulkan/gskvulkanscissorop.c b/gsk/vulkan/gskvulkanscissorop.c
index bd9a3c5a69..c8f792f7ca 100644
--- a/gsk/vulkan/gskvulkanscissorop.c
+++ b/gsk/vulkan/gskvulkanscissorop.c
@@ -47,7 +47,7 @@ gsk_vulkan_scissor_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_scissor_op_get_pipeline (GskVulkanOp *op)
 {
   return NULL;
diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c
index 3f6bcda334..873f524567 100644
--- a/gsk/vulkan/gskvulkantextureop.c
+++ b/gsk/vulkan/gskvulkantextureop.c
@@ -88,12 +88,12 @@ gsk_vulkan_texture_op_reserve_descriptor_sets (GskVulkanOp     *op,
   self->sampler_descriptor = gsk_vulkan_render_get_sampler_descriptor (render, self->sampler);
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_texture_op_get_pipeline (GskVulkanOp *op)
 {
   GskVulkanTextureOp *self = (GskVulkanTextureOp *) op;
 
-  return self->pipeline;
+  return gsk_vulkan_pipeline_get_pipeline (self->pipeline);
 }
 
 static void
diff --git a/gsk/vulkan/gskvulkanuploadcairoop.c b/gsk/vulkan/gskvulkanuploadcairoop.c
index c3cbf0e729..962714c289 100644
--- a/gsk/vulkan/gskvulkanuploadcairoop.c
+++ b/gsk/vulkan/gskvulkanuploadcairoop.c
@@ -81,7 +81,7 @@ gsk_vulkan_upload_cairo_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_upload_cairo_op_get_pipeline (GskVulkanOp *op)
 {
   return NULL;
diff --git a/gsk/vulkan/gskvulkanuploadop.c b/gsk/vulkan/gskvulkanuploadop.c
index 81e61e347d..52e159ad87 100644
--- a/gsk/vulkan/gskvulkanuploadop.c
+++ b/gsk/vulkan/gskvulkanuploadop.c
@@ -62,7 +62,7 @@ gsk_vulkan_upload_op_reserve_descriptor_sets (GskVulkanOp     *op,
 {
 }
 
-static GskVulkanPipeline *
+static VkPipeline
 gsk_vulkan_upload_op_get_pipeline (GskVulkanOp *op)
 {
   return NULL;