diff --git a/gdk/gdkmemoryformat.c b/gdk/gdkmemoryformat.c
index e098603237..64ad4a76d6 100644
--- a/gdk/gdkmemoryformat.c
+++ b/gdk/gdkmemoryformat.c
@@ -28,6 +28,8 @@
 
 #include <epoxy/gl.h>
 
+G_STATIC_ASSERT ((1 << GDK_MEMORY_DEPTH_BITS) > GDK_N_DEPTHS);
+
 typedef struct _GdkMemoryFormatDescription GdkMemoryFormatDescription;
 
 #define TYPED_FUNCS(name, T, R, G, B, A, bpp, scale) \
diff --git a/gdk/gdkmemoryformatprivate.h b/gdk/gdkmemoryformatprivate.h
index 09a9cd6b2c..7edf34b376 100644
--- a/gdk/gdkmemoryformatprivate.h
+++ b/gdk/gdkmemoryformatprivate.h
@@ -45,6 +45,8 @@ typedef enum {
   GDK_N_DEPTHS
 } GdkMemoryDepth;
 
+#define GDK_MEMORY_DEPTH_BITS 3
+
 gsize                   gdk_memory_format_alignment         (GdkMemoryFormat             format) G_GNUC_CONST;
 GdkMemoryAlpha          gdk_memory_format_alpha             (GdkMemoryFormat             format) G_GNUC_CONST;
 gsize                   gdk_memory_format_bytes_per_pixel   (GdkMemoryFormat             format) G_GNUC_CONST;
diff --git a/gsk/gskrendernodeprivate.h b/gsk/gskrendernodeprivate.h
index 9c8565cfb3..4d794b1094 100644
--- a/gsk/gskrendernodeprivate.h
+++ b/gsk/gskrendernodeprivate.h
@@ -32,7 +32,7 @@ struct _GskRenderNode
 
   graphene_rect_t bounds;
 
-  guint preferred_depth : 2;
+  guint preferred_depth : GDK_MEMORY_DEPTH_BITS;
   guint offscreen_for_opacity : 1;
 };