From ccfab45fe27252dac2aa23eb237e738d7c0551b2 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Thu, 31 Jul 2025 21:56:18 +0200 Subject: [PATCH] nv50: fully migrate away from util_framebuffer_init somehow missed those.. oops. Fixes: facb048cdbb ("nouveau: move util_framebuffer_init into the driver") Part-of: (cherry picked from commit cbb288171638afebf35b49529410814b06154206) --- .pick_status.json | 2 +- src/gallium/drivers/nouveau/nv50/nv50_context.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_state.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 66cc4afe5f1..64292f59e0c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3144,7 +3144,7 @@ "description": "nv50: fully migrate away from util_framebuffer_init", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "facb048cdbbe1acffb41cdfbebc9042c1d539cd4", "notes": null diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c index 192f1fda79f..afc09d01ba6 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_context.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c @@ -150,7 +150,7 @@ nv50_context_unreference_resources(struct nv50_context *nv50) nouveau_bufctx_del(&nv50->bufctx); nouveau_bufctx_del(&nv50->bufctx_cp); - util_framebuffer_init(&nv50->base.pipe, NULL, nv50->fb_cbufs, &nv50->fb_zsbuf); + nv50_framebuffer_init(&nv50->base.pipe, NULL, nv50->fb_cbufs, &nv50->fb_zsbuf); util_unreference_framebuffer_state(&nv50->framebuffer); assert(nv50->num_vtxbufs <= PIPE_MAX_ATTRIBS); diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index 6e217cc1779..a68919f966e 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -1006,7 +1006,7 @@ nv50_set_framebuffer_state(struct pipe_context *pipe, nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_FB); - util_framebuffer_init(pipe, fb, nv50->fb_cbufs, &nv50->fb_zsbuf); + nv50_framebuffer_init(pipe, fb, nv50->fb_cbufs, &nv50->fb_zsbuf); util_copy_framebuffer_state(&nv50->framebuffer, fb); nv50->dirty_3d |= NV50_NEW_3D_FRAMEBUFFER | NV50_NEW_3D_TEXTURES;