diff --git a/.pick_status.json b/.pick_status.json
index 120606c87f3..a012de92cd8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1394,7 +1394,7 @@
         "description": "gallium: fix ddebug and noop screen caps init",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a036231c096a6dec717e0e3c6b85a83a29c50723",
         "notes": null
diff --git a/src/gallium/auxiliary/driver_ddebug/dd_screen.c b/src/gallium/auxiliary/driver_ddebug/dd_screen.c
index 57abbd899e1..72f8f164351 100644
--- a/src/gallium/auxiliary/driver_ddebug/dd_screen.c
+++ b/src/gallium/auxiliary/driver_ddebug/dd_screen.c
@@ -679,6 +679,9 @@ ddebug_screen_create(struct pipe_screen *screen)
    SCR_INIT(vertex_state_destroy);
    dscreen->base.get_driver_pipe_screen = dd_get_driver_pipe_screen;
 
+   /* copy all caps */
+   *(struct pipe_caps *)&dscreen->base.caps = screen->caps;
+
 #undef SCR_INIT
 
    dscreen->screen = screen;
diff --git a/src/gallium/auxiliary/driver_noop/noop_pipe.c b/src/gallium/auxiliary/driver_noop/noop_pipe.c
index b180d8f73f3..c67db0899a2 100644
--- a/src/gallium/auxiliary/driver_noop/noop_pipe.c
+++ b/src/gallium/auxiliary/driver_noop/noop_pipe.c
@@ -831,6 +831,9 @@ struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen)
    screen->query_compression_modifiers = noop_query_compression_modifiers;
    screen->get_driver_pipe_screen = noop_get_driver_pipe_screen;
 
+   /* copy all caps */
+   *(struct pipe_caps *)&screen->caps = oscreen->caps;
+
    slab_create_parent(&noop_screen->pool_transfers,
                       sizeof(struct pipe_transfer), 64);